Skip to contentSkip to conversation

fix block/cciss.c with PROC_FS=n

PATCH New Adrian Bunk 1 participant 1 message Oct 12, 2004 Block layer

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 fix block/cciss.c with PROC_FS=n

I got the following compile error in both 2.6.9-rc4 and 2.6.9-rc4-mm1 when compiling with CONFIG_PROC_FS=n:

<-- snip -->

...
LD .tmp_vmlinux1
kernel/built-in.o(.text+0x1d42b): In function `crash_create_proc_entry':
: undefined reference to proc_vmcore' drivers/built-in.o(.text+0x234eb8): In function cciss_init_one':
: undefined reference to cciss_scsi_setup' drivers/built-in.o(.text+0x235173): In function cciss_remove_one':
: undefined reference to `cciss_unregister_scsi'
make: *** [.tmp_vmlinux1] Error 1

<-- snip -->

The patch below fixes this issue.

I don't know whether this might qualify it for 2.6.9:
- it fixes the only CONFIG_PROC_FS=n compile error I found in 2.6.9-rc4
- it has obviously no effect in the CONFIG_PROC_FS=y case

drivers/block/cciss.c renamed from drivers/block/cciss.c.old +2 -1
@@ -185,10 +185,11 @@
         }
         return c;
 }
-#ifdef CONFIG_PROC_FS
 
 #include "cciss_scsi.c"		/* For SCSI tape support */
 
+#ifdef CONFIG_PROC_FS
+
 /*
  * Report information about this controller.
  */