diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2006-01-11 09:05:36 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-01-11 09:05:36 -0800 |
| commit | c4a28a4f7fe1269989bb7e46f14231ef67316bb3 (patch) | |
| tree | 26077cad438d73ac50dbf12f9727716e183f5ee4 /pci | |
| parent | 91a2cf51903acbc90f5b4d2453ddcafa09f8d20a (diff) | |
| download | patches-c4a28a4f7fe1269989bb7e46f14231ef67316bb3.tar.gz | |
2.6.15-git7 refresh
Diffstat (limited to 'pci')
| -rw-r--r-- | pci/pci-drivers-pci-pci.c-if-0-pci_find_ext_capability.patch | 4 | ||||
| -rw-r--r-- | pci/pci-irq-and-pci_ids-patch-for-intel-ich8.patch | 2 | ||||
| -rw-r--r-- | pci/pci-restore-2-missing-pci-ids.patch | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/pci/pci-drivers-pci-pci.c-if-0-pci_find_ext_capability.patch b/pci/pci-drivers-pci-pci.c-if-0-pci_find_ext_capability.patch index fb9edeaa319c9..21b446124c4de 100644 --- a/pci/pci-drivers-pci-pci.c-if-0-pci_find_ext_capability.patch +++ b/pci/pci-drivers-pci-pci.c-if-0-pci_find_ext_capability.patch @@ -19,7 +19,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- gregkh-2.6.orig/include/linux/pci.h +++ gregkh-2.6/include/linux/pci.h -@@ -400,7 +400,6 @@ struct pci_dev *pci_find_device_reverse +@@ -406,7 +406,6 @@ struct pci_dev *pci_find_device_reverse struct pci_dev *pci_find_slot (unsigned int bus, unsigned int devfn); int pci_find_capability (struct pci_dev *dev, int cap); int pci_find_next_capability (struct pci_dev *dev, u8 pos, int cap); @@ -27,7 +27,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> struct pci_bus * pci_find_next_bus(const struct pci_bus *from); struct pci_dev *pci_get_device (unsigned int vendor, unsigned int device, struct pci_dev *from); -@@ -625,7 +624,6 @@ static inline int pci_register_driver(st +@@ -626,7 +625,6 @@ static inline int pci_register_driver(st static inline void pci_unregister_driver(struct pci_driver *drv) { } static inline int pci_find_capability (struct pci_dev *dev, int cap) {return 0; } static inline int pci_find_next_capability (struct pci_dev *dev, u8 post, int cap) { return 0; } diff --git a/pci/pci-irq-and-pci_ids-patch-for-intel-ich8.patch b/pci/pci-irq-and-pci_ids-patch-for-intel-ich8.patch index d3a19d5f82b07..55309ed340acb 100644 --- a/pci/pci-irq-and-pci_ids-patch-for-intel-ich8.patch +++ b/pci/pci-irq-and-pci_ids-patch-for-intel-ich8.patch @@ -33,7 +33,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> r->set = pirq_piix_set; --- gregkh-2.6.orig/include/linux/pci_ids.h +++ gregkh-2.6/include/linux/pci_ids.h -@@ -2088,6 +2088,13 @@ +@@ -2102,6 +2102,13 @@ #define PCI_DEVICE_ID_INTEL_ICH7_19 0x27dd #define PCI_DEVICE_ID_INTEL_ICH7_20 0x27de #define PCI_DEVICE_ID_INTEL_ICH7_21 0x27df diff --git a/pci/pci-restore-2-missing-pci-ids.patch b/pci/pci-restore-2-missing-pci-ids.patch index f66e2d84a5460..fa0e821f842f2 100644 --- a/pci/pci-restore-2-missing-pci-ids.patch +++ b/pci/pci-restore-2-missing-pci-ids.patch @@ -22,7 +22,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- gregkh-2.6.orig/include/linux/pci_ids.h +++ gregkh-2.6/include/linux/pci_ids.h -@@ -2049,6 +2049,7 @@ +@@ -2063,6 +2063,7 @@ #define PCI_DEVICE_ID_INTEL_82801EB_5 0x24d5 #define PCI_DEVICE_ID_INTEL_82801EB_6 0x24d6 #define PCI_DEVICE_ID_INTEL_82801EB_11 0x24db @@ -30,7 +30,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> #define PCI_DEVICE_ID_INTEL_ESB_1 0x25a1 #define PCI_DEVICE_ID_INTEL_ESB_2 0x25a2 #define PCI_DEVICE_ID_INTEL_ESB_4 0x25a4 -@@ -2138,6 +2139,7 @@ +@@ -2152,6 +2153,7 @@ #define PCI_DEVICE_ID_INTEL_82443GX_2 0x71a2 #define PCI_DEVICE_ID_INTEL_82372FB_1 0x7601 #define PCI_DEVICE_ID_INTEL_82454GX 0x84c4 |