aboutsummaryrefslogtreecommitdiffstats
path: root/pci
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2005-11-10 10:58:09 -0800
committerGreg Kroah-Hartman <gregkh@suse.de>2005-11-10 10:58:09 -0800
commit63242bdcdecd229c3cdd37e9c58946d6fff48f58 (patch)
tree0b54353b8c3d78e26e099cdbe4d1c800f2d7dafa /pci
parentc953c83ba6541a60f2224495a42e01fa6668b129 (diff)
downloadpatches-63242bdcdecd229c3cdd37e9c58946d6fff48f58.tar.gz
refresh for 2.6.14-git13
Diffstat (limited to 'pci')
-rw-r--r--pci/pci-driver-owner-removal.patch17
-rw-r--r--pci/pci_driver_auto_set_owner.patch2
2 files changed, 15 insertions, 4 deletions
diff --git a/pci/pci-driver-owner-removal.patch b/pci/pci-driver-owner-removal.patch
index 20c1faa0d6818..8b3b80c19dfe2 100644
--- a/pci/pci-driver-owner-removal.patch
+++ b/pci/pci-driver-owner-removal.patch
@@ -42,6 +42,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/i2c/busses/i2c-viapro.c | 1 -
drivers/i2c/busses/i2c-voodoo3.c | 1 -
drivers/infiniband/hw/mthca/mthca_main.c | 1 -
+ drivers/net/spider_net.c | 1 -
drivers/usb/gadget/goku_udc.c | 1 -
drivers/usb/gadget/net2280.c | 1 -
drivers/usb/host/ehci-pci.c | 1 -
@@ -86,7 +87,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
sound/pci/via82xx_modem.c | 1 -
sound/pci/vx222/vx222.c | 1 -
sound/pci/ymfpci/ymfpci.c | 1 -
- 80 files changed, 80 deletions(-)
+ 81 files changed, 81 deletions(-)
--- gregkh-2.6.orig/drivers/usb/host/ehci-pci.c
+++ gregkh-2.6/drivers/usb/host/ehci-pci.c
@@ -820,7 +821,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
.probe = agp_efficeon_probe,
--- gregkh-2.6.orig/drivers/char/agp/i460-agp.c
+++ gregkh-2.6/drivers/char/agp/i460-agp.c
-@@ -617,7 +617,6 @@ static struct pci_device_id agp_intel_i4
+@@ -622,7 +622,6 @@ static struct pci_device_id agp_intel_i4
MODULE_DEVICE_TABLE(pci, agp_intel_i460_pci_table);
static struct pci_driver agp_intel_i460_pci_driver = {
@@ -830,7 +831,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
.probe = agp_intel_i460_probe,
--- gregkh-2.6.orig/drivers/char/agp/intel-agp.c
+++ gregkh-2.6/drivers/char/agp/intel-agp.c
-@@ -1824,7 +1824,6 @@ static struct pci_device_id agp_intel_pc
+@@ -1827,7 +1827,6 @@ static struct pci_device_id agp_intel_pc
MODULE_DEVICE_TABLE(pci, agp_intel_pci_table);
static struct pci_driver agp_intel_pci_driver = {
@@ -888,3 +889,13 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
.name = "agpgart-via",
.id_table = agp_via_pci_table,
.probe = agp_via_probe,
+--- gregkh-2.6.orig/drivers/net/spider_net.c
++++ gregkh-2.6/drivers/net/spider_net.c
+@@ -2290,7 +2290,6 @@ spider_net_remove(struct pci_dev *pdev)
+ }
+
+ static struct pci_driver spider_net_driver = {
+- .owner = THIS_MODULE,
+ .name = spider_net_driver_name,
+ .id_table = spider_net_pci_tbl,
+ .probe = spider_net_probe,
diff --git a/pci/pci_driver_auto_set_owner.patch b/pci/pci_driver_auto_set_owner.patch
index 9b8542974cbcd..78886ba1d97df 100644
--- a/pci/pci_driver_auto_set_owner.patch
+++ b/pci/pci_driver_auto_set_owner.patch
@@ -136,7 +136,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
}
--- gregkh-2.6.orig/include/linux/ide.h
+++ gregkh-2.6/include/linux/ide.h
-@@ -1324,7 +1324,8 @@ void ide_init_disk(struct gendisk *, ide
+@@ -1329,7 +1329,8 @@ void ide_init_disk(struct gendisk *, ide
extern int ideprobe_init(void);
extern void ide_scan_pcibus(int scan_direction) __init;