[patch] 2.6.9-rc4-mm1: USB compile error with PROC_FS=n

[Adrian Bunk]

On Mon, Oct 11, 2004 at 03:25:02AM -0700, Andrew Morton wrote:
>...
> All 741 patches
>...
> bk-usb.patch
>...


This removes an #ifdef CONFIG_PROC_FS from drivers/usb/core/inode.c 
which is required, since now compilation fails with CONFIG_PROC_FS=n:


<--  snip  -->

...
  CC      drivers/usb/core/inode.o
drivers/usb/core/inode.c: In function `usbfs_init':
drivers/usb/core/inode.c:750: `proc_bus' undeclared (first use in this function)
drivers/usb/core/inode.c:750: (Each undeclared identifier is reported only once
drivers/usb/core/inode.c:750: for each function it appears in.)
make[3]: *** [drivers/usb/core/inode.o] Error 1

<--  snip  -->


The fix is simple:


Signed-off-by: Adrian Bunk <bunk@xxxxxxxxx>

--- linux-2.6.9-rc4-mm1-full/drivers/usb/core/inode.c.old	2004-10-12 16:20:54.000000000 +0200
+++ linux-2.6.9-rc4-mm1-full/drivers/usb/core/inode.c	2004-10-12 16:23:53.000000000 +0200
@@ -746,8 +746,10 @@
 		return retval;
 	}
 
+#ifdef CONFIG_PROC_FS
 	/* create mount point for usbfs */
 	usbdir = proc_mkdir("usb", proc_bus);
+#endif
 
 	return 0;
 }
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/