aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorLasse Collin <lasse.collin@tukaani.org>2011-07-24 19:54:25 +0300
committerGreg Kroah-Hartman <gregkh@suse.de>2011-08-04 21:58:38 -0700
commit947204a724d45083033b6706dad40d47022e5d70 (patch)
tree88d24ff6144108579ec4c0f2e9fae4c67b439a4d /lib
parentff7b3dc6a634832a912445db8bffd18b05c15043 (diff)
downloadkernel_samsung_crespo-947204a724d45083033b6706dad40d47022e5d70.zip
kernel_samsung_crespo-947204a724d45083033b6706dad40d47022e5d70.tar.gz
kernel_samsung_crespo-947204a724d45083033b6706dad40d47022e5d70.tar.bz2
XZ: Fix missing <linux/kernel.h> include
commit 81d67439855a7f928d90965d832aa4f2fb677342 upstream. <linux/kernel.h> is needed for min_t. The old version happened to work on x86 because <asm/unaligned.h> indirectly includes <linux/kernel.h>, but it didn't work on ARM. <linux/kernel.h> includes <asm/byteorder.h> so it's not necessary to include it explicitly anymore. Signed-off-by: Lasse Collin <lasse.collin@tukaani.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
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