Merge bk://linus.bkbits.net/linux-2.5

into hostme.bitkeeper.com:/ua/repos/j/jfs/linux-2.5

Merge bk://linus.bkbits.net/linux-2.5
into hostme.bitkeeper.com:/ua/repos/j/jfs/linux-2.5
d95f6b25 · Dave Kleikamp · 6ba38f00 · 50ac9a5a · d95f6b25 · d95f6b25
Commit d95f6b25 authored Sep 10, 2002 by Dave Kleikamp
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 2 deletions

drivers/usb/host/ehci-hcd.c drivers/usb/host/ehci-hcd.c +1 -0

drivers/usb/host/ehci.h drivers/usb/host/ehci.h +1 -0

include/linux/pci_ids.h include/linux/pci_ids.h +3 -2

No files found.
--- a/drivers/usb/host/ehci-hcd.c
+++ b/drivers/usb/host/ehci-hcd.c
@@ -39,6 +39,7 @@
 #include <linux/usb.h>
+#include <linux/version.h>
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,32)
 #include "../hcd.h"
 #else

--- a/drivers/usb/host/ehci.h
+++ b/drivers/usb/host/ehci.h
@@ -393,6 +393,7 @@ struct ehci_fstn {
 /*-------------------------------------------------------------------------*/
+#include <linux/version.h>
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,32)
 #define SUBMIT_URB(urb,mem_flags) usb_submit_urb(urb)

--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -755,9 +755,10 @@
 #define PCI_DEVICE_ID_CMD_648		0x0648
 #define PCI_DEVICE_ID_CMD_649		0x0649
 #define PCI_DEVICE_ID_CMD_670		0x0670
+#define PCI_DEVICE_ID_CMD_680		0x0680
-#define PCI_DEVICE_ID_SII_680          0x0680
+#define PCI_DEVICE_ID_SII_680		0x0680
-#define PCI_DEVICE_ID_SII_3112         0x3112
+#define PCI_DEVICE_ID_SII_3112		0x3112
 #define PCI_VENDOR_ID_VISION		0x1098
 #define PCI_DEVICE_ID_VISION_QD8500	0x0001