Skip to content

L
linux
Commit d95f6b25 authored by Dave Kleikamp's avatar Dave Kleikamp
Browse files
Options

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

into hostme.bitkeeper.com:/ua/repos/j/jfs/linux-2.5
parents 6ba38f00 50ac9a5a
Show whitespace changes
Inline Side-by-side
Showing with 5 additions and 2 deletions
drivers/usb/host/ehci-hcd.c
View file @ d95f6b25
...@@ -39,6 +39,7 @@ ...@@ -39,6 +39,7 @@
#include <linux/usb.h> #include <linux/usb.h>
#include <linux/version.h>
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,32) #if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,32)
#include "../hcd.h" #include "../hcd.h"
#else #else
......
drivers/usb/host/ehci.h
View file @ d95f6b25
...@@ -393,6 +393,7 @@ struct ehci_fstn { ...@@ -393,6 +393,7 @@ struct ehci_fstn {
/*-------------------------------------------------------------------------*/ /*-------------------------------------------------------------------------*/
#include <linux/version.h>
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,32) #if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,32)
#define SUBMIT_URB(urb,mem_flags) usb_submit_urb(urb) #define SUBMIT_URB(urb,mem_flags) usb_submit_urb(urb)
......
include/linux/pci_ids.h
View file @ d95f6b25
...@@ -755,6 +755,7 @@ ...@@ -755,6 +755,7 @@
#define PCI_DEVICE_ID_CMD_648 0x0648 #define PCI_DEVICE_ID_CMD_648 0x0648
#define PCI_DEVICE_ID_CMD_649 0x0649 #define PCI_DEVICE_ID_CMD_649 0x0649
#define PCI_DEVICE_ID_CMD_670 0x0670 #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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7