[PATCH 287/342] Staging: cpc-usb: fix some build problems in the driver

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



It will now build properly on the latest kernel tree.

Cc: Sebastian Haas <haas at ems-wuensche.com>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
---
 drivers/staging/cpc-usb/cpc-usb_drv.c |    5 +----
 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 a08c665..b8ef701 100644
--- a/drivers/staging/cpc-usb/cpc-usb_drv.c
+++ b/drivers/staging/cpc-usb/cpc-usb_drv.c
@@ -49,7 +49,7 @@
 /* Version Information */
 #define DRIVER_AUTHOR  "Sebastian Haas <haas at ems-wuensche.com>"
 #define DRIVER_DESC    "CPC-USB Driver for Linux Kernel 2.6"
-#define DRIVER_VERSION CPC_DRIVER_VERSION " (CDKL v" CDKL_VERSION ")"
+#define DRIVER_VERSION CPC_DRIVER_VERSION
 
 MODULE_AUTHOR(DRIVER_AUTHOR);
 MODULE_DESCRIPTION(DRIVER_DESC);
@@ -1198,7 +1198,6 @@ static int __init CPCUsb_Init(void)
 	if (!procDir) {
 		err("Could not create proc entry");
 	} else {
-		procDir->owner = THIS_MODULE;
 		procEntry = create_proc_read_entry("info", 0444, procDir,
 						   cpcusb_proc_read_info,
 						   NULL);
@@ -1206,8 +1205,6 @@ static int __init CPCUsb_Init(void)
 			err("Could not create proc entry %s", CPC_USB_PROC_DIR "/info");
 			remove_proc_entry(CPC_USB_PROC_DIR, NULL);
 			procDir = NULL;
-		} else {
-			procEntry->owner = THIS_MODULE;
 		}
 	}
 
-- 
1.6.3.2



[Index of Archives]     [Linux Driver Backports]     [DMA Engine]     [Linux GPIO]     [Linux SPI]     [Video for Linux]     [Linux USB Devel]     [Linux Coverity]     [Linux Audio Users]     [Linux Kernel]     [Linux SCSI]     [Yosemite Backpacking]
  Powered by Linux