diff options
Diffstat (limited to 'drivers/usb/misc/sisusbvga/sisusb.c')
-rw-r--r-- | drivers/usb/misc/sisusbvga/sisusb.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/usb/misc/sisusbvga/sisusb.c b/drivers/usb/misc/sisusbvga/sisusb.c index 39db3155723a..c946c9a538a0 100644 --- a/drivers/usb/misc/sisusbvga/sisusb.c +++ b/drivers/usb/misc/sisusbvga/sisusb.c | |||
@@ -2440,7 +2440,7 @@ int | |||
2440 | sisusb_reset_text_mode(struct sisusb_usb_data *sisusb, int init) | 2440 | sisusb_reset_text_mode(struct sisusb_usb_data *sisusb, int init) |
2441 | { | 2441 | { |
2442 | int ret = 0, slot = sisusb->font_slot, i; | 2442 | int ret = 0, slot = sisusb->font_slot, i; |
2443 | struct font_desc *myfont; | 2443 | const struct font_desc *myfont; |
2444 | u8 *tempbuf; | 2444 | u8 *tempbuf; |
2445 | u16 *tempbufb; | 2445 | u16 *tempbufb; |
2446 | size_t written; | 2446 | size_t written; |
@@ -3239,12 +3239,7 @@ static struct file_operations usb_sisusb_fops = { | |||
3239 | }; | 3239 | }; |
3240 | 3240 | ||
3241 | static struct usb_class_driver usb_sisusb_class = { | 3241 | static struct usb_class_driver usb_sisusb_class = { |
3242 | #if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,13) | ||
3243 | .name = "usb/sisusbvga%d", | ||
3244 | .mode = S_IFCHR | S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP, | ||
3245 | #else | ||
3246 | .name = "sisusbvga%d", | 3242 | .name = "sisusbvga%d", |
3247 | #endif | ||
3248 | .fops = &usb_sisusb_fops, | 3243 | .fops = &usb_sisusb_fops, |
3249 | .minor_base = SISUSB_MINOR | 3244 | .minor_base = SISUSB_MINOR |
3250 | }; | 3245 | }; |