Skip to content

Commit

Permalink
[PATCH] USB: remove LINUX_VERSION_CODE macro usage
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Pekka Enberg authored and Greg Kroah-Hartman committed Mar 20, 2006
1 parent e266a12 commit 35cce73
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 14 deletions.
1 change: 0 additions & 1 deletion drivers/usb/media/pwc/pwc-ctrl.c
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@
#include <asm/uaccess.h>
#endif
#include <asm/errno.h>
#include <linux/version.h>

#include "pwc.h"
#include "pwc-ioctl.h"
Expand Down
6 changes: 1 addition & 5 deletions drivers/usb/media/pwc/pwc-if.c
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@
#include <linux/poll.h>
#include <linux/slab.h>
#include <linux/vmalloc.h>
#include <linux/version.h>
#include <asm/io.h>

#include "pwc.h"
Expand Down Expand Up @@ -827,13 +826,10 @@ static int pwc_isoc_init(struct pwc_device *pdev)
/* Get the current alternate interface, adjust packet size */
if (!udev->actconfig)
return -EFAULT;
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,5)
idesc = &udev->actconfig->interface[0]->altsetting[pdev->valternate];
#else

intf = usb_ifnum_to_if(udev, 0);
if (intf)
idesc = usb_altnum_to_altsetting(intf, pdev->valternate);
#endif

if (!idesc)
return -EFAULT;
Expand Down
8 changes: 0 additions & 8 deletions drivers/usb/misc/sisusbvga/sisusb.h
Original file line number Diff line number Diff line change
Expand Up @@ -37,24 +37,16 @@
#ifndef _SISUSB_H_
#define _SISUSB_H_

#include <linux/version.h>
#ifdef CONFIG_COMPAT
#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,10)
#include <linux/ioctl32.h>
#define SISUSB_OLD_CONFIG_COMPAT
#else
#define SISUSB_NEW_CONFIG_COMPAT
#endif
#endif

/* For older kernels, support for text consoles is by default
* off. To ensable text console support, change the following:
*/
#if 0
#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,13)
#define CONFIG_USB_SISUSBVGA_CON
#endif
#endif

/* Version Information */

Expand Down

0 comments on commit 35cce73

Please sign in to comment.