aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorColin Cross <ccross@android.com>2011-08-10 18:08:07 -0700
committerColin Cross <ccross@android.com>2011-08-10 18:08:07 -0700
commit6ba1c700230f1e9cadd5abb15edba8573c0de40e (patch)
tree9a51a553382574b59d343c837934683764a2e241 /lib
parentd2c3c40789e6645e40c8538182acf7a6831d1db3 (diff)
parent94ed5b4788a7cdbe68bc7cb8516972cbebdc8274 (diff)
downloadkernel_samsung_espresso10-6ba1c700230f1e9cadd5abb15edba8573c0de40e.zip
kernel_samsung_espresso10-6ba1c700230f1e9cadd5abb15edba8573c0de40e.tar.gz
kernel_samsung_espresso10-6ba1c700230f1e9cadd5abb15edba8573c0de40e.tar.bz2
Merge commit 'v3.0.1' into linux-omap-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 a65633e..482b90f 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