From 8e3875a184c39ed0e4e27a846eadee2fe7d60fa6 Mon Sep 17 00:00:00 2001
From: Phillip Lougher <phillip@lougher.demon.co.uk>
Date: Wed, 5 Jan 2011 18:23:53 +0000
Subject: [PATCH] --- yaml --- r: 231538 b: refs/heads/master c:
 01a678c5a2f41663b8faf03d17e2bbdbf44158a9 h: refs/heads/master v: v3

---
 [refs]                           | 2 +-
 trunk/fs/squashfs/decompressor.c | 8 ++------
 trunk/fs/squashfs/decompressor.h | 4 ++++
 trunk/fs/squashfs/squashfs.h     | 3 ---
 4 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index 18b0e5bbc7a6..2130caa18400 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8fcd97216f45b1691f8f91f35cc108d06e0bfca8
+refs/heads/master: 01a678c5a2f41663b8faf03d17e2bbdbf44158a9
diff --git a/trunk/fs/squashfs/decompressor.c b/trunk/fs/squashfs/decompressor.c
index 50b22d330cec..a5940e54c4dd 100644
--- a/trunk/fs/squashfs/decompressor.c
+++ b/trunk/fs/squashfs/decompressor.c
@@ -40,7 +40,7 @@ static const struct squashfs_decompressor squashfs_lzma_unsupported_comp_ops = {
 };
 
 #ifndef CONFIG_SQUASHFS_LZO
-static const struct squashfs_decompressor squashfs_lzo_unsupported_comp_ops = {
+static const struct squashfs_decompressor squashfs_lzo_comp_ops = {
 	NULL, NULL, NULL, LZO_COMPRESSION, "lzo", 0
 };
 #endif
@@ -57,13 +57,9 @@ static const struct squashfs_decompressor squashfs_unknown_comp_ops = {
 
 static const struct squashfs_decompressor *decompressor[] = {
 	&squashfs_zlib_comp_ops,
-	&squashfs_lzma_unsupported_comp_ops,
-#ifdef CONFIG_SQUASHFS_LZO
 	&squashfs_lzo_comp_ops,
-#else
-	&squashfs_lzo_unsupported_comp_ops,
-#endif
 	&squashfs_xz_comp_ops,
+	&squashfs_lzma_unsupported_comp_ops,
 	&squashfs_unknown_comp_ops
 };
 
diff --git a/trunk/fs/squashfs/decompressor.h b/trunk/fs/squashfs/decompressor.h
index 57e1acb4c6a9..3b305a70f7aa 100644
--- a/trunk/fs/squashfs/decompressor.h
+++ b/trunk/fs/squashfs/decompressor.h
@@ -57,4 +57,8 @@ static inline int squashfs_decompress(struct squashfs_sb_info *msblk,
 extern const struct squashfs_decompressor squashfs_xz_comp_ops;
 #endif
 
+#ifdef CONFIG_SQUASHFS_LZO
+extern const struct squashfs_decompressor squashfs_lzo_comp_ops;
+#endif
+
 #endif
diff --git a/trunk/fs/squashfs/squashfs.h b/trunk/fs/squashfs/squashfs.h
index 18f187fb486b..ba729d808876 100644
--- a/trunk/fs/squashfs/squashfs.h
+++ b/trunk/fs/squashfs/squashfs.h
@@ -99,6 +99,3 @@ extern const struct xattr_handler *squashfs_xattr_handlers[];
 
 /* zlib_wrapper.c */
 extern const struct squashfs_decompressor squashfs_zlib_comp_ops;
-
-/* lzo_wrapper.c */
-extern const struct squashfs_decompressor squashfs_lzo_comp_ops;