diff options
author | Pekka Enberg <penberg@cs.helsinki.fi> | 2006-01-12 13:35:25 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-03-20 17:49:54 -0500 |
commit | 35cce732d9d4d9af6b4ad4d26d8f8c0eddb573a2 (patch) | |
tree | 1fbb63a0c8b5e661d70a8aa97c036f9e58edf197 /drivers/usb/media | |
parent | e266a12492f7ca9142882710bff92e902b7c95c8 (diff) |
[PATCH] USB: remove LINUX_VERSION_CODE macro usage
This patch removes unnecessary LINUX_VERSION_CODE macro usage from
drivers/usb/.
Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/media')
-rw-r--r-- | drivers/usb/media/pwc/pwc-ctrl.c | 1 | ||||
-rw-r--r-- | drivers/usb/media/pwc/pwc-if.c | 6 |
2 files changed, 1 insertions, 6 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; |