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@xxxxxxxxx>
---
drivers/staging/cpc-usb/Kconfig | 2 +-
drivers/staging/cpc-usb/cpc-usb_drv.c | 8 +-------
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 00924ce..2be0bc9 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 14aca39..d337a97 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 dfdbed1..a0d60c0 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
--
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
