From efcc9aecebea6e9fb0ad66e9124a6e37b09fc137 Mon Sep 17 00:00:00 2001
From: Albin Tonnerre <albin.tonnerre@free-electrons.com>
Date: Thu, 6 Aug 2009 15:09:32 -0700
Subject: [PATCH] --- yaml --- r: 156433 b: refs/heads/master c:
 9e5cf0ca2e9b65110ae5f094d7f0f7165cd1bbbb h: refs/heads/master i:   156431:
 8068d5cdbc8dffc38b0e77230076759acea0ccd2 v: v3

---
 [refs]                         | 2 +-
 trunk/lib/decompress_bunzip2.c | 2 +-
 trunk/lib/decompress_inflate.c | 2 +-
 trunk/lib/decompress_unlzma.c  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index cb7bf487cf9b..3b7981614367 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b1af4315d823a2b6659c5b14bc17f7bc61878ef4
+refs/heads/master: 9e5cf0ca2e9b65110ae5f094d7f0f7165cd1bbbb
diff --git a/trunk/lib/decompress_bunzip2.c b/trunk/lib/decompress_bunzip2.c
index d3dc9f2beb27..600f473a5610 100644
--- a/trunk/lib/decompress_bunzip2.c
+++ b/trunk/lib/decompress_bunzip2.c
@@ -49,10 +49,10 @@
 #define PREBOOT
 #else
 #include <linux/decompress/bunzip2.h>
+#include <linux/slab.h>
 #endif /* STATIC */
 
 #include <linux/decompress/mm.h>
-#include <linux/slab.h>
 
 #ifndef INT_MAX
 #define INT_MAX 0x7fffffff
diff --git a/trunk/lib/decompress_inflate.c b/trunk/lib/decompress_inflate.c
index bfe605ac534f..68dfce59c1b8 100644
--- a/trunk/lib/decompress_inflate.c
+++ b/trunk/lib/decompress_inflate.c
@@ -19,11 +19,11 @@
 #include "zlib_inflate/inflate.h"
 
 #include "zlib_inflate/infutil.h"
+#include <linux/slab.h>
 
 #endif /* STATIC */
 
 #include <linux/decompress/mm.h>
-#include <linux/slab.h>
 
 #define GZIP_IOBUF_SIZE (16*1024)
 
diff --git a/trunk/lib/decompress_unlzma.c b/trunk/lib/decompress_unlzma.c
index d3f9468e49dc..0b954e04bd30 100644
--- a/trunk/lib/decompress_unlzma.c
+++ b/trunk/lib/decompress_unlzma.c
@@ -33,10 +33,10 @@
 #define PREBOOT
 #else
 #include <linux/decompress/unlzma.h>
+#include <linux/slab.h>
 #endif /* STATIC */
 
 #include <linux/decompress/mm.h>
-#include <linux/slab.h>
 
 #define	MIN(a, b) (((a) < (b)) ? (a) : (b))