summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorLasse Collin <lasse.collin@tukaani.org>2011-07-24 19:54:25 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2011-07-24 10:00:08 -0700
commit81d67439855a7f928d90965d832aa4f2fb677342 (patch)
tree56bd690fe13c7d8e97d15284eb896c5952dd8113 /lib
parent21c7075fa5a756f1c95f6b463ff42cd320cc0301 (diff)
downloadop-kernel-dev-81d67439855a7f928d90965d832aa4f2fb677342.zip
op-kernel-dev-81d67439855a7f928d90965d832aa4f2fb677342.tar.gz
XZ: Fix missing <linux/kernel.h> include
<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> Cc: stable <stable@kernel.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
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
OpenPOWER on IntegriCloud