diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2006-01-03 10:37:40 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-01-03 10:37:40 -0800 |
| commit | 7c5bb7c46c50b7a008ed3401c1d018dcd192d288 (patch) | |
| tree | 7eda4a6d1a2f90f324bcfda2310df6bba4c25b23 /pci | |
| parent | 373ecab16727fcb04e0d4684f5c65ce92f2e6ede (diff) | |
| download | patches-7c5bb7c46c50b7a008ed3401c1d018dcd192d288.tar.gz | |
2.6.15 refreshv2.6.15
Diffstat (limited to 'pci')
| -rw-r--r-- | pci/drivers-net-replace-pci_module_init-with-pci_register_driver.patch | 6 | ||||
| -rw-r--r-- | pci/x86-pci-domain-support-struct-pci_sysdata.patch | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pci/drivers-net-replace-pci_module_init-with-pci_register_driver.patch b/pci/drivers-net-replace-pci_module_init-with-pci_register_driver.patch index a44c25aacb66c..02d9bbc22be9f 100644 --- a/pci/drivers-net-replace-pci_module_init-with-pci_register_driver.patch +++ b/pci/drivers-net-replace-pci_module_init-with-pci_register_driver.patch @@ -272,7 +272,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> static void __exit fealnx_exit(void) --- gregkh-2.6.orig/drivers/net/forcedeth.c +++ gregkh-2.6/drivers/net/forcedeth.c -@@ -2720,7 +2720,7 @@ static struct pci_driver driver = { +@@ -2721,7 +2721,7 @@ static struct pci_driver driver = { static int __init init_nic(void) { printk(KERN_INFO "forcedeth.c: Reverse Engineered nForce ethernet driver. Version %s.\n", FORCEDETH_VERSION); @@ -514,7 +514,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> static void __exit tc35815_cleanup_module(void) --- gregkh-2.6.orig/drivers/net/tg3.c +++ gregkh-2.6/drivers/net/tg3.c -@@ -10946,7 +10946,7 @@ static struct pci_driver tg3_driver = { +@@ -10951,7 +10951,7 @@ static struct pci_driver tg3_driver = { static int __init tg3_init(void) { @@ -767,7 +767,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> return ret; --- gregkh-2.6.orig/drivers/net/wireless/orinoco_nortel.c +++ gregkh-2.6/drivers/net/wireless/orinoco_nortel.c -@@ -287,7 +287,7 @@ MODULE_LICENSE("Dual MPL/GPL"); +@@ -291,7 +291,7 @@ MODULE_LICENSE("Dual MPL/GPL"); static int __init nortel_pci_init(void) { printk(KERN_DEBUG "%s\n", version); diff --git a/pci/x86-pci-domain-support-struct-pci_sysdata.patch b/pci/x86-pci-domain-support-struct-pci_sysdata.patch index a1224ee9a961b..4bf9e4cb351c3 100644 --- a/pci/x86-pci-domain-support-struct-pci_sysdata.patch +++ b/pci/x86-pci-domain-support-struct-pci_sysdata.patch @@ -141,7 +141,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> +++ gregkh-2.6/include/asm-x86_64/topology.h @@ -25,7 +25,7 @@ extern int __node_distance(int, int); #define parent_node(node) (node) - #define node_to_first_cpu(node) (__ffs(node_to_cpumask[node])) + #define node_to_first_cpu(node) (first_cpu(node_to_cpumask[node])) #define node_to_cpumask(node) (node_to_cpumask[node]) -#define pcibus_to_node(bus) ((long)(bus->sysdata)) +#define pcibus_to_node(bus) ((struct pci_sysdata *)((bus)->sysdata))->node |