From: Randy Dunlap <randy.dunlap@xxxxxxxxxx>
The proper way to check for and enforce a kconfig symbol
dependency is via Kconfig files, not by using #error in
a source file followed by 9 other compile errors.
Signed-off-by: Randy Dunlap <randy.dunlap@xxxxxxxxxx>
Cc: Sebastian Haas <haas@xxxxxxxxxxxxxxxx>
---
drivers/staging/cpc-usb/Kconfig | 2 +-
drivers/staging/cpc-usb/cpc-usb_drv.c | 10 +---------
2 files changed, 2 insertions(+), 10 deletions(-)
--- linux-next-20090522.orig/drivers/staging/cpc-usb/cpc-usb_drv.c
+++ linux-next-20090522/drivers/staging/cpc-usb/cpc-usb_drv.c
@@ -27,12 +27,8 @@
#include <linux/completion.h>
#include <asm/uaccess.h>
#include <linux/usb.h>
-
#include <linux/version.h>
-
-#ifdef CONFIG_PROC_FS
-# include <linux/proc_fs.h>
-#endif
+#include <linux/proc_fs.h>
#include "cpc.h"
@@ -57,10 +53,6 @@ MODULE_LICENSE("GPL v2");
#define USB_CPCUSB_M16C_PRODUCT_ID 0x0888
#define USB_CPCUSB_LPC2119_PRODUCT_ID 0x0444
-#ifndef CONFIG_PROC_FS
-#error "PROCFS needed"
-#endif
-
#define CPC_USB_PROC_DIR CPC_PROC_DIR "cpc-usb"
static struct proc_dir_entry *procDir;
--- linux-next-20090522.orig/drivers/staging/cpc-usb/Kconfig
+++ linux-next-20090522/drivers/staging/cpc-usb/Kconfig
@@ -1,4 +1,4 @@
config USB_CPC
tristate "CPC CAN USB driver"
- depends on USB
+ depends on USB && PROC_FS
default n
--
~Randy
LPC 2009, Sept. 23-25, Portland, Oregon
http://linuxplumbersconf.org/2009/
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
