aboutsummaryrefslogtreecommitdiff
path: root/drivers/staging
diff options
context:
space:
mode:
authorAlexander Beregalov <a.beregalov@gmail.com>2009-05-21 15:44:45 +0400
committerGreg Kroah-Hartman <gregkh@suse.de>2009-06-19 11:00:53 -0700
commitc32a4e066c42b1b4bd7c472814bce09f16ff8202 (patch)
tree383e4837e27d160bbbd281a8eb49962f0b3ece3b /drivers/staging
parenta3d97c9b192df8e9c6a041f9452b400070ce2d02 (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>
Diffstat (limited to 'drivers/staging')
-rw-r--r--drivers/staging/cpc-usb/Kconfig2
-rw-r--r--drivers/staging/cpc-usb/cpc-usb_drv.c8
-rw-r--r--drivers/staging/cpc-usb/cpc_int.h4
3 files changed, 3 insertions, 11 deletions
diff --git a/drivers/staging/cpc-usb/Kconfig b/drivers/staging/cpc-usb/Kconfig
index 00924ce8195..2be0bc9c39d 100644
--- a/drivers/staging/cpc-usb/Kconfig
+++ b/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
diff --git a/drivers/staging/cpc-usb/cpc-usb_drv.c b/drivers/staging/cpc-usb/cpc-usb_drv.c
index 672f7866a69..52f0f0eebb5 100644
--- a/drivers/staging/cpc-usb/cpc-usb_drv.c
+++ b/drivers/staging/cpc-usb/cpc-usb_drv.c
@@ -30,9 +30,7 @@
#include <linux/version.h>
-#ifdef CONFIG_PROC_FS
-# include <linux/proc_fs.h>
-#endif
+#include <linux/proc_fs.h>
#include "cpc.h"
@@ -57,10 +55,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;
diff --git a/drivers/staging/cpc-usb/cpc_int.h b/drivers/staging/cpc-usb/cpc_int.h
index dfdbed1c1f9..a0d60c08081 100644
--- a/drivers/staging/cpc-usb/cpc_int.h
+++ b/drivers/staging/cpc-usb/cpc_int.h
@@ -15,9 +15,7 @@
#define CPC_MSG_BUF_CNT 1500
-#ifdef CONFIG_PROC_FS
-# define CPC_PROC_DIR "driver/"
-#endif
+#define CPC_PROC_DIR "driver/"
#undef dbg
#undef err