From: Alexander Beregalov <a.beregalov@gmail•com>
To: gregkh@suse•de
Cc: linux-kernel@vger•kernel.org, linux-next@vger•kernel.org,
Alexander Beregalov <a.beregalov@gmail•com>
Subject: [PATCH 1/2] Staging: cpc-usb: depends on PROC_FS
Date: Thu, 21 May 2009 15:44:45 +0400 [thread overview]
Message-ID: <1242906286-7066-1-git-send-email-a.beregalov@gmail.com> (raw)
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>
---
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
next reply other threads:[~2009-05-21 11:45 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-05-21 11:44 Alexander Beregalov [this message]
2009-05-21 11:44 ` [PATCH 2/2] Staging: cpc-usb: fix printk format warnings Alexander Beregalov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1242906286-7066-1-git-send-email-a.beregalov@gmail.com \
--to=a.beregalov@gmail$(echo .)com \
--cc=gregkh@suse$(echo .)de \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox