rpms/kernel/F-10 squashfs3.patch,1.1,1.2

[Chuck Ebbert]

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7891

Modified Files:
	squashfs3.patch 
Log Message:
fix up squashfs3 ifdefs

squashfs3.patch:

Index: squashfs3.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/squashfs3.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- squashfs3.patch	23 Mar 2009 20:22:13 -0000	1.1
+++ squashfs3.patch	24 Mar 2009 04:14:20 -0000	1.2
@@ -104,7 +104,7 @@
 + * inode.c
 + */
 +
-+#if defined(CONFIG_SQUASHFS)
++#if defined(CONFIG_SQUASHFS) || defined(CONFIG_SQUASHFS_MODULE)
 +#error CONFIG_SQUASHFS and CONFIG_SQUASHFS3 conflict
 +#endif
 +
@@ -4170,7 +4170,7 @@
  
  #include "do_mounts.h"
 +
-+#ifdef CONFIG_SQUASHFS3
++#if defined(CONFIG_SQUASHFS3) || defined(CONFIG_SQUASHFS3_MODULE)
 +#include "../fs/squashfs3/squashfs3_fs.h"
 +#else
  #include "../fs/squashfs/squashfs_fs.h"