aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorColin Cross <ccross@android.com>2011-08-10 18:07:59 -0700
committerColin Cross <ccross@android.com>2011-08-10 18:07:59 -0700
commit9abd59b0df155835a970c2b9c8f93367eb793797 (patch)
treebcf0868f831d204e2b582113c53b8de3ff015eca /lib
parent4e111751cfcb75f26d2725eab934b6eb91a3d115 (diff)
parent94ed5b4788a7cdbe68bc7cb8516972cbebdc8274 (diff)
downloadkernel_samsung_espresso10-9abd59b0df155835a970c2b9c8f93367eb793797.tar.gz
kernel_samsung_espresso10-9abd59b0df155835a970c2b9c8f93367eb793797.tar.bz2
kernel_samsung_espresso10-9abd59b0df155835a970c2b9c8f93367eb793797.zip
Merge commit 'v3.0.1' into android-3.0
Diffstat (limited to 'lib')
-rw-r--r--lib/xz/xz_private.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/xz/xz_private.h b/lib/xz/xz_private.h
index a65633e0696..482b90f363f 100644
--- a/lib/xz/xz_private.h
+++ b/lib/xz/xz_private.h
@@ -12,7 +12,7 @@
#ifdef __KERNEL__
# include <linux/xz.h>
-# include <asm/byteorder.h>
+# include <linux/kernel.h>
# include <asm/unaligned.h>
/* XZ_PREBOOT may be defined only via decompress_unxz.c. */
# ifndef XZ_PREBOOT