summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLasse Collin <lasse.collin@tukaani.org>2011-07-24 19:54:25 +0300
committerJonas ABERG <jonas.aberg@stericsson.com>2011-10-28 11:12:06 +0200
commit3509276374e1a6b7cae81d068d253badac324c69 (patch)
treeb79a3ccfbfbb84a48cbb1c7b953c3915cf86aa86
parentf49deea54a64ad17342e3fa1e2405c1184e25ce2 (diff)
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> Change-Id: Ic4c879abd8e26c47523f7a589644956d7588d2e7 Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/35640 Tested-by: Per VAHLNE <per.xx.vahlne@stericsson.com> Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com>
-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