aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2009-05-14 23:56:58 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2009-06-19 14:00:53 -0400
commit84a209d01c58d74f291efc82e313b132ecec7be0 (patch)
tree843e7aac4b9d4dec135cca3b19e1fb527e1e03fd /drivers/staging
parente0ce8a7265fec155f97438c80dedd7f01ff0055f (diff)
Staging: cpc-usb: fix some build problems in the driver
It will now build properly on the latest kernel tree. Cc: Sebastian Haas <haas@ems-wuensche.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging')
-rw-r--r--drivers/staging/cpc-usb/cpc-usb_drv.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/staging/cpc-usb/cpc-usb_drv.c b/drivers/staging/cpc-usb/cpc-usb_drv.c
index a08c6655b86..b8ef701a2bc 100644
--- a/drivers/staging/cpc-usb/cpc-usb_drv.c
+++ b/drivers/staging/cpc-usb/cpc-usb_drv.c
@@ -49,7 +49,7 @@
49/* Version Information */ 49/* Version Information */
50#define DRIVER_AUTHOR "Sebastian Haas <haas@ems-wuensche.com>" 50#define DRIVER_AUTHOR "Sebastian Haas <haas@ems-wuensche.com>"
51#define DRIVER_DESC "CPC-USB Driver for Linux Kernel 2.6" 51#define DRIVER_DESC "CPC-USB Driver for Linux Kernel 2.6"
52#define DRIVER_VERSION CPC_DRIVER_VERSION " (CDKL v" CDKL_VERSION ")" 52#define DRIVER_VERSION CPC_DRIVER_VERSION
53 53
54MODULE_AUTHOR(DRIVER_AUTHOR); 54MODULE_AUTHOR(DRIVER_AUTHOR);
55MODULE_DESCRIPTION(DRIVER_DESC); 55MODULE_DESCRIPTION(DRIVER_DESC);
@@ -1198,7 +1198,6 @@ static int __init CPCUsb_Init(void)
1198 if (!procDir) { 1198 if (!procDir) {
1199 err("Could not create proc entry"); 1199 err("Could not create proc entry");
1200 } else { 1200 } else {
1201 procDir->owner = THIS_MODULE;
1202 procEntry = create_proc_read_entry("info", 0444, procDir, 1201 procEntry = create_proc_read_entry("info", 0444, procDir,
1203 cpcusb_proc_read_info, 1202 cpcusb_proc_read_info,
1204 NULL); 1203 NULL);
@@ -1206,8 +1205,6 @@ static int __init CPCUsb_Init(void)
1206 err("Could not create proc entry %s", CPC_USB_PROC_DIR "/info"); 1205 err("Could not create proc entry %s", CPC_USB_PROC_DIR "/info");
1207 remove_proc_entry(CPC_USB_PROC_DIR, NULL); 1206 remove_proc_entry(CPC_USB_PROC_DIR, NULL);
1208 procDir = NULL; 1207 procDir = NULL;
1209 } else {
1210 procEntry->owner = THIS_MODULE;
1211 } 1208 }
1212 } 1209 }
1213 1210