diff options
author | Alexander Beregalov <a.beregalov@gmail.com> | 2009-05-21 07:44:45 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-06-19 14:00:53 -0400 |
commit | c32a4e066c42b1b4bd7c472814bce09f16ff8202 (patch) | |
tree | 383e4837e27d160bbbd281a8eb49962f0b3ece3b | |
parent | a3d97c9b192df8e9c6a041f9452b400070ce2d02 (diff) |
Staging: cpc-usb: depends on PROC_FS
Fix this build error when PROC_FS is not enabled:
cpc-usb_drv.c:61:2: error: #error "PROCFS needed"
cpc-usb_drv.c:1159: error: implicit declaration of function 'proc_mkdir'
Signed-off-by: Alexander Beregalov <a.beregalov@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r-- | drivers/staging/cpc-usb/Kconfig | 2 | ||||
-rw-r--r-- | drivers/staging/cpc-usb/cpc-usb_drv.c | 8 | ||||
-rw-r--r-- | drivers/staging/cpc-usb/cpc_int.h | 4 |
3 files changed, 3 insertions, 11 deletions
diff --git a/drivers/staging/cpc-usb/Kconfig b/drivers/staging/cpc-usb/Kconfig index 00924ce81956..2be0bc9c39d0 100644 --- a/drivers/staging/cpc-usb/Kconfig +++ b/drivers/staging/cpc-usb/Kconfig | |||
@@ -1,4 +1,4 @@ | |||
1 | config USB_CPC | 1 | config USB_CPC |
2 | tristate "CPC CAN USB driver" | 2 | tristate "CPC CAN USB driver" |
3 | depends on USB | 3 | depends on USB && PROC_FS |
4 | default n | 4 | default n |
diff --git a/drivers/staging/cpc-usb/cpc-usb_drv.c b/drivers/staging/cpc-usb/cpc-usb_drv.c index 672f7866a69c..52f0f0eebb51 100644 --- a/drivers/staging/cpc-usb/cpc-usb_drv.c +++ b/drivers/staging/cpc-usb/cpc-usb_drv.c | |||
@@ -30,9 +30,7 @@ | |||
30 | 30 | ||
31 | #include <linux/version.h> | 31 | #include <linux/version.h> |
32 | 32 | ||
33 | #ifdef CONFIG_PROC_FS | 33 | #include <linux/proc_fs.h> |
34 | # include <linux/proc_fs.h> | ||
35 | #endif | ||
36 | 34 | ||
37 | #include "cpc.h" | 35 | #include "cpc.h" |
38 | 36 | ||
@@ -57,10 +55,6 @@ MODULE_LICENSE("GPL v2"); | |||
57 | #define USB_CPCUSB_M16C_PRODUCT_ID 0x0888 | 55 | #define USB_CPCUSB_M16C_PRODUCT_ID 0x0888 |
58 | #define USB_CPCUSB_LPC2119_PRODUCT_ID 0x0444 | 56 | #define USB_CPCUSB_LPC2119_PRODUCT_ID 0x0444 |
59 | 57 | ||
60 | #ifndef CONFIG_PROC_FS | ||
61 | #error "PROCFS needed" | ||
62 | #endif | ||
63 | |||
64 | #define CPC_USB_PROC_DIR CPC_PROC_DIR "cpc-usb" | 58 | #define CPC_USB_PROC_DIR CPC_PROC_DIR "cpc-usb" |
65 | 59 | ||
66 | static struct proc_dir_entry *procDir; | 60 | static struct proc_dir_entry *procDir; |
diff --git a/drivers/staging/cpc-usb/cpc_int.h b/drivers/staging/cpc-usb/cpc_int.h index dfdbed1c1f96..a0d60c080819 100644 --- a/drivers/staging/cpc-usb/cpc_int.h +++ b/drivers/staging/cpc-usb/cpc_int.h | |||
@@ -15,9 +15,7 @@ | |||
15 | 15 | ||
16 | #define CPC_MSG_BUF_CNT 1500 | 16 | #define CPC_MSG_BUF_CNT 1500 |
17 | 17 | ||
18 | #ifdef CONFIG_PROC_FS | 18 | #define CPC_PROC_DIR "driver/" |
19 | # define CPC_PROC_DIR "driver/" | ||
20 | #endif | ||
21 | 19 | ||
22 | #undef dbg | 20 | #undef dbg |
23 | #undef err | 21 | #undef err |