diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2006-01-13 09:17:19 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-01-13 09:17:19 -0800 |
| commit | f08129a3698a4d5c6ef35cd88d8304eda01f8fd3 (patch) | |
| tree | 5790f8e68c60fcda6618a9815b649becd18222e1 /pci | |
| parent | accf026e092e5dbb915fd127ba91ef0735fc1046 (diff) | |
| download | patches-f08129a3698a4d5c6ef35cd88d8304eda01f8fd3.tar.gz | |
2.6.15-git9 refresh
Diffstat (limited to 'pci')
| -rw-r--r-- | pci/drivers-net-replace-pci_module_init-with-pci_register_driver.patch | 2 | ||||
| -rw-r--r-- | pci/pci-error-recovery-e100-network-device-driver.patch | 4 |
2 files changed, 3 insertions, 3 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 636ef13f33b9b..47e2cb10b2c3b 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 @@ -228,7 +228,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> } --- gregkh-2.6.orig/drivers/net/e100.c +++ gregkh-2.6/drivers/net/e100.c -@@ -2792,7 +2792,7 @@ static int __init e100_init_module(void) +@@ -2818,7 +2818,7 @@ static int __init e100_init_module(void) printk(KERN_INFO PFX "%s, %s\n", DRV_DESCRIPTION, DRV_VERSION); printk(KERN_INFO PFX "%s\n", DRV_COPYRIGHT); } diff --git a/pci/pci-error-recovery-e100-network-device-driver.patch b/pci/pci-error-recovery-e100-network-device-driver.patch index 296a5498f9411..6a26dd29ca32b 100644 --- a/pci/pci-error-recovery-e100-network-device-driver.patch +++ b/pci/pci-error-recovery-e100-network-device-driver.patch @@ -19,7 +19,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- gregkh-2.6.orig/drivers/net/e100.c +++ gregkh-2.6/drivers/net/e100.c -@@ -2704,6 +2704,75 @@ static void e100_shutdown(struct pci_dev +@@ -2730,6 +2730,75 @@ static void e100_shutdown(struct pci_dev } @@ -95,7 +95,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> static struct pci_driver e100_driver = { .name = DRV_NAME, .id_table = e100_id_table, -@@ -2714,6 +2783,7 @@ static struct pci_driver e100_driver = { +@@ -2740,6 +2809,7 @@ static struct pci_driver e100_driver = { .resume = e100_resume, #endif .shutdown = e100_shutdown, |