Skip to content Skip to conversation

SN-subsys corrected patch

PATCH New Henne 1 participant 1 message Apr 25, 2006 Kernel janitors

Share & tools

Henne

author

2006-04-25 14:35 UTC #0 lore raw

PATCH 1/1 SN-subsys corrected patch

Sorry,

I made a little mistake. Please remove my old sn_patch and take this one instead.

From: Henrik Kretzschmar <[email protected]>

Marking the pci_driver_id tables of sn-subsystem as __devinitdata and removing a bogus __devinitdata from ioc4's pci_driver table.

Signed-off-by Henrik Kretzschmar <[email protected]>

---
I hope nobody found out what happened in this pci_driver case.

drivers/sn/ioc3.c +1 -1

diff -urN linux-2.6.17-rc2/drivers/sn/ioc3.c linux/drivers/sn/ioc3.c
@@ -800,7 +800,7 @@
  	kfree(idd);
  }
 
-static struct pci_device_id ioc3_id_table[] = {
+static struct pci_device_id ioc3_id_table[] __devinitdata = {
  	{PCI_VENDOR_ID_SGI, PCI_DEVICE_ID_SGI_IOC3, PCI_ANY_ID, PCI_ANY_ID},
  	{0}
  };

drivers/sn/ioc4.c +2 -2

diff -urN linux-2.6.17-rc2/drivers/sn/ioc4.c linux/drivers/sn/ioc4.c
@@ -378,13 +378,13 @@
  	kfree(idd);
  }
 
-static struct pci_device_id ioc4_id_table[] = {
+static struct pci_device_id ioc4_id_table[] __devinitdata = {
  	{PCI_VENDOR_ID_SGI, PCI_DEVICE_ID_SGI_IOC4, PCI_ANY_ID,
  	 PCI_ANY_ID, 0x0b4000, 0xFFFFFF},
  	{0}
  };
 
-static struct pci_driver __devinitdata ioc4_driver = {
+static struct pci_driver ioc4_driver __devinitdata = {
  	.name = "IOC4",
  	.id_table = ioc4_id_table,
  	.probe = ioc4_probe,

_______________________________________________
Kernel-janitors mailing list
[email protected]
https://lists.osdl.org/mailman/listinfo/kernel-janitors