[PATCH] stable AGP pci_device_id tables

This should fix all the AGP drivers.

pci_device_id tables can not and must not be marked discardable.  They
are used for as long as the driver is registered.

diff --git a/drivers/char/agp/ati-agp.c b/drivers/char/agp/ati-agp.c
index 7ec62223e4194fa5cf10e793746d389b3ba36c05..59a671bea21685c1f53afcb083cad69d13572cd0 100644 (file)
--- a/drivers/char/agp/ati-agp.c
+++ b/drivers/char/agp/ati-agp.c
@@ -491,7 +491,7 @@ static void __devexit agp_ati_remove(struct pci_dev *pdev)
        agp_put_bridge(bridge);
 }
 
-static struct pci_device_id agp_ati_pci_table[] __initdata = {
+static struct pci_device_id agp_ati_pci_table[] = {
        {
        .class          = (PCI_CLASS_BRIDGE_HOST << 8),
        .class_mask     = ~0,

diff --git a/drivers/char/agp/sis-agp.c b/drivers/char/agp/sis-agp.c
index f79d7b1f90280b86ae3eb57092fbc04bfdabf9a6..0d7e663166244c3898b4e0fae743a8f23230b1fd 100644 (file)
--- a/drivers/char/agp/sis-agp.c
+++ b/drivers/char/agp/sis-agp.c
@@ -215,7 +215,7 @@ static void __devexit agp_sis_remove(struct pci_dev *pdev)
        agp_put_bridge(bridge);
 }
 
-static struct pci_device_id agp_sis_pci_table[] __initdata = {
+static struct pci_device_id agp_sis_pci_table[] = {
        {
        .class          = (PCI_CLASS_BRIDGE_HOST << 8),
        .class_mask     = ~0,

diff --git a/drivers/char/agp/uninorth-agp.c b/drivers/char/agp/uninorth-agp.c
index a89924fa3a503d17fe99f8e838f9b76585d3e635..1fa77885c111d9f8a64d7d6054d5a27865b34636 100644 (file)
--- a/drivers/char/agp/uninorth-agp.c
+++ b/drivers/char/agp/uninorth-agp.c
@@ -350,7 +350,7 @@ static void __devexit agp_uninorth_remove(struct pci_dev *pdev)
        agp_put_bridge(bridge);
 }
 
-static struct pci_device_id agp_uninorth_pci_table[] __initdata = {
+static struct pci_device_id agp_uninorth_pci_table[] = {
        {
        .class          = (PCI_CLASS_BRIDGE_HOST << 8),
        .class_mask     = ~0,

diff --git a/drivers/char/agp/via-agp.c b/drivers/char/agp/via-agp.c
index 5d8768a90ed17ca89d88e2d4baa2758db7de8748..fb248b5585fda131dd4a908adbea958970e65e89 100644 (file)
--- a/drivers/char/agp/via-agp.c
+++ b/drivers/char/agp/via-agp.c
@@ -432,7 +432,7 @@ static void __devexit agp_via_remove(struct pci_dev *pdev)
        agp_put_bridge(bridge);
 }
 
-static struct pci_device_id agp_via_pci_table[] __initdata = {
+static struct pci_device_id agp_via_pci_table[] = {
        {
        .class          = (PCI_CLASS_BRIDGE_HOST << 8),
        .class_mask     = ~0,