diff options
-rw-r--r-- | drivers/usb/media/pwc/pwc-ctrl.c | 1 | ||||
-rw-r--r-- | drivers/usb/media/pwc/pwc-if.c | 6 | ||||
-rw-r--r-- | drivers/usb/misc/sisusbvga/sisusb.h | 8 |
3 files changed, 1 insertions, 14 deletions
diff --git a/drivers/usb/media/pwc/pwc-ctrl.c b/drivers/usb/media/pwc/pwc-ctrl.c index 3ebb6e9cdf92..0398b812e0ce 100644 --- a/drivers/usb/media/pwc/pwc-ctrl.c +++ b/drivers/usb/media/pwc/pwc-ctrl.c | |||
@@ -41,7 +41,6 @@ | |||
41 | #include <asm/uaccess.h> | 41 | #include <asm/uaccess.h> |
42 | #endif | 42 | #endif |
43 | #include <asm/errno.h> | 43 | #include <asm/errno.h> |
44 | #include <linux/version.h> | ||
45 | 44 | ||
46 | #include "pwc.h" | 45 | #include "pwc.h" |
47 | #include "pwc-ioctl.h" | 46 | #include "pwc-ioctl.h" |
diff --git a/drivers/usb/media/pwc/pwc-if.c b/drivers/usb/media/pwc/pwc-if.c index 4f9b0dc6fd7b..db6753dc5ba5 100644 --- a/drivers/usb/media/pwc/pwc-if.c +++ b/drivers/usb/media/pwc/pwc-if.c | |||
@@ -62,7 +62,6 @@ | |||
62 | #include <linux/poll.h> | 62 | #include <linux/poll.h> |
63 | #include <linux/slab.h> | 63 | #include <linux/slab.h> |
64 | #include <linux/vmalloc.h> | 64 | #include <linux/vmalloc.h> |
65 | #include <linux/version.h> | ||
66 | #include <asm/io.h> | 65 | #include <asm/io.h> |
67 | 66 | ||
68 | #include "pwc.h" | 67 | #include "pwc.h" |
@@ -827,13 +826,10 @@ static int pwc_isoc_init(struct pwc_device *pdev) | |||
827 | /* Get the current alternate interface, adjust packet size */ | 826 | /* Get the current alternate interface, adjust packet size */ |
828 | if (!udev->actconfig) | 827 | if (!udev->actconfig) |
829 | return -EFAULT; | 828 | return -EFAULT; |
830 | #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,5) | 829 | |
831 | idesc = &udev->actconfig->interface[0]->altsetting[pdev->valternate]; | ||
832 | #else | ||
833 | intf = usb_ifnum_to_if(udev, 0); | 830 | intf = usb_ifnum_to_if(udev, 0); |
834 | if (intf) | 831 | if (intf) |
835 | idesc = usb_altnum_to_altsetting(intf, pdev->valternate); | 832 | idesc = usb_altnum_to_altsetting(intf, pdev->valternate); |
836 | #endif | ||
837 | 833 | ||
838 | if (!idesc) | 834 | if (!idesc) |
839 | return -EFAULT; | 835 | return -EFAULT; |
diff --git a/drivers/usb/misc/sisusbvga/sisusb.h b/drivers/usb/misc/sisusbvga/sisusb.h index 1d7a77cc7c4a..a716825d1f9b 100644 --- a/drivers/usb/misc/sisusbvga/sisusb.h +++ b/drivers/usb/misc/sisusbvga/sisusb.h | |||
@@ -37,24 +37,16 @@ | |||
37 | #ifndef _SISUSB_H_ | 37 | #ifndef _SISUSB_H_ |
38 | #define _SISUSB_H_ | 38 | #define _SISUSB_H_ |
39 | 39 | ||
40 | #include <linux/version.h> | ||
41 | #ifdef CONFIG_COMPAT | 40 | #ifdef CONFIG_COMPAT |
42 | #if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,10) | ||
43 | #include <linux/ioctl32.h> | ||
44 | #define SISUSB_OLD_CONFIG_COMPAT | ||
45 | #else | ||
46 | #define SISUSB_NEW_CONFIG_COMPAT | 41 | #define SISUSB_NEW_CONFIG_COMPAT |
47 | #endif | 42 | #endif |
48 | #endif | ||
49 | 43 | ||
50 | /* For older kernels, support for text consoles is by default | 44 | /* For older kernels, support for text consoles is by default |
51 | * off. To ensable text console support, change the following: | 45 | * off. To ensable text console support, change the following: |
52 | */ | 46 | */ |
53 | #if 0 | 47 | #if 0 |
54 | #if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,13) | ||
55 | #define CONFIG_USB_SISUSBVGA_CON | 48 | #define CONFIG_USB_SISUSBVGA_CON |
56 | #endif | 49 | #endif |
57 | #endif | ||
58 | 50 | ||
59 | /* Version Information */ | 51 | /* Version Information */ |
60 | 52 | ||