diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-10-20 09:17:34 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-20 09:17:34 -0400 |
| commit | a32750c2ca6f697903b19063fc86f4272865e3a1 (patch) | |
| tree | 57a23806c5358855eb426c006c88943afa683b1b /drivers/net/wireless/rt2x00/rt73usb.c | |
| parent | 318007e9001349db9b4fcd49e9e79a7636dba7a9 (diff) | |
| parent | d870ea1d6bc5057f2599416655b42ab192dae6d0 (diff) | |
Merge branches 'imx/pata' and 'imx/sata' into next/driver
Conflicts:
arch/arm/mach-mx5/clock-mx51-mx53.c
arch/arm/mach-mx5/devices-imx53.h
Diffstat (limited to 'drivers/net/wireless/rt2x00/rt73usb.c')
| -rw-r--r-- | drivers/net/wireless/rt2x00/rt73usb.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/wireless/rt2x00/rt73usb.c b/drivers/net/wireless/rt2x00/rt73usb.c index 6a93939f44e8..0baeb894f093 100644 --- a/drivers/net/wireless/rt2x00/rt73usb.c +++ b/drivers/net/wireless/rt2x00/rt73usb.c | |||
| @@ -2420,6 +2420,7 @@ static struct usb_device_id rt73usb_device_table[] = { | |||
| 2420 | /* Buffalo */ | 2420 | /* Buffalo */ |
| 2421 | { USB_DEVICE(0x0411, 0x00d8) }, | 2421 | { USB_DEVICE(0x0411, 0x00d8) }, |
| 2422 | { USB_DEVICE(0x0411, 0x00d9) }, | 2422 | { USB_DEVICE(0x0411, 0x00d9) }, |
| 2423 | { USB_DEVICE(0x0411, 0x00e6) }, | ||
| 2423 | { USB_DEVICE(0x0411, 0x00f4) }, | 2424 | { USB_DEVICE(0x0411, 0x00f4) }, |
| 2424 | { USB_DEVICE(0x0411, 0x0116) }, | 2425 | { USB_DEVICE(0x0411, 0x0116) }, |
| 2425 | { USB_DEVICE(0x0411, 0x0119) }, | 2426 | { USB_DEVICE(0x0411, 0x0119) }, |