fix the readwrite/readonly clashes for the pci_driver structs in the sis

code. This is trivial, I did it for the other components before.

Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Stefan Reinauer <stepan@coresystems.de>



git-svn-id: svn://svn.coreboot.org/coreboot/trunk@2905 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

12 files changed, 26 insertions, 27 deletions

diff --git a/src/southbridge/sis/sis966/sis966_aza.c b/src/southbridge/sis/sis966/sis966_aza.c
index 48fd0e7288..bb308a598f 100644
--- a/src/southbridge/sis/sis966/sis966_aza.c
+++ b/src/southbridge/sis/sis966/sis966_aza.c
@@ -31,8 +31,7 @@
 #include <arch/io.h>
 #include "sis966.h"
 
-uint8_t	SiS_SiS7502_init[6][3]={
-
+uint8_t	SiS_SiS7502_init[7][3]={
 {0x04, 0xFF, 0x07},					 
 {0x2C, 0xFF, 0x39},					 
 {0x2D, 0xFF, 0x10},					 
@@ -493,7 +492,7 @@ static struct device_operations aza_audio_ops  = {
 	.ops_pci	= &lops_pci,
 };
 
-static struct pci_driver azaaudio_driver __pci_driver = {
+static const struct pci_driver azaaudio_driver __pci_driver = {
 	.ops	= &aza_audio_ops,
 	.vendor	= PCI_VENDOR_ID_SIS,
 	.device	= PCI_DEVICE_ID_SIS_SIS966_AZA,
diff --git a/src/southbridge/sis/sis966/sis966_ht.c b/src/southbridge/sis/sis966/sis966_ht.c
index 702138d8da..16daea4d6d 100644
--- a/src/southbridge/sis/sis966/sis966_ht.c
+++ b/src/southbridge/sis/sis966/sis966_ht.c
@@ -48,7 +48,7 @@ static struct device_operations ht_ops  = {
 	.ops_pci	= &lops_pci,
 };
 
-static struct pci_driver ht_driver __pci_driver = {
+static const struct pci_driver ht_driver __pci_driver = {
 	.ops	= &ht_ops,
 	.vendor	= PCI_VENDOR_ID_SIS,
 	.device	= PCI_DEVICE_ID_SIS_SIS966_HT,
diff --git a/src/southbridge/sis/sis966/sis966_ide.c b/src/southbridge/sis/sis966/sis966_ide.c
index 0b2b3439aa..875ccc27ff 100644
--- a/src/southbridge/sis/sis966/sis966_ide.c
+++ b/src/southbridge/sis/sis966/sis966_ide.c
@@ -167,7 +167,7 @@ static struct device_operations ide_ops  = {
 	.ops_pci	= &lops_pci,
 };
 
-static struct pci_driver ide_driver __pci_driver = {
+static const struct pci_driver ide_driver __pci_driver = {
 	.ops	= &ide_ops,
 	.vendor	= PCI_VENDOR_ID_SIS,
 	.device	= PCI_DEVICE_ID_SIS_SIS966_IDE,
diff --git a/src/southbridge/sis/sis966/sis966_lpc.c b/src/southbridge/sis/sis966/sis966_lpc.c
index efb7b2e151..7f7197c56a 100644
--- a/src/southbridge/sis/sis966/sis966_lpc.c
+++ b/src/southbridge/sis/sis966/sis966_lpc.c
@@ -397,39 +397,39 @@ static struct device_operations lpc_ops  = {
 //	.enable		= sis966_enable,
 	.ops_pci	= &lops_pci,
 };
-static struct pci_driver lpc_driver __pci_driver = {
+static const struct pci_driver lpc_driver __pci_driver = {
 	.ops	= &lpc_ops,
 	.vendor	= PCI_VENDOR_ID_SIS,
 	.device	= PCI_DEVICE_ID_SIS_SIS966_LPC,
 };
 
-static struct pci_driver lpc_driver_pro __pci_driver = {
+static const struct pci_driver lpc_driver_pro __pci_driver = {
 	.ops	= &lpc_ops,
 	.vendor	= PCI_VENDOR_ID_SIS,
 	.device	= PCI_DEVICE_ID_SIS_SIS966_PRO,
 };
 
-static struct pci_driver lpc_driver_lpc2 __pci_driver = {
+static const struct pci_driver lpc_driver_lpc2 __pci_driver = {
 	.ops	= &lpc_ops,
 	.vendor	= PCI_VENDOR_ID_SIS,
 	.device	= PCI_DEVICE_ID_SIS_SIS966_LPC_2,
 };
-static struct pci_driver lpc_driver_lpc3 __pci_driver = {
+static const struct pci_driver lpc_driver_lpc3 __pci_driver = {
 	.ops	= &lpc_ops,
 	.vendor	= PCI_VENDOR_ID_SIS,
 	.device	= PCI_DEVICE_ID_SIS_SIS966_LPC_3,
 };
-static struct pci_driver lpc_driver_lpc4 __pci_driver = {
+static const struct pci_driver lpc_driver_lpc4 __pci_driver = {
 	.ops	= &lpc_ops,
 	.vendor	= PCI_VENDOR_ID_SIS,
 	.device	= PCI_DEVICE_ID_SIS_SIS966_LPC_4,
 };
-static struct pci_driver lpc_driver_lpc5 __pci_driver = {
+static const struct pci_driver lpc_driver_lpc5 __pci_driver = {
 	.ops	= &lpc_ops,
 	.vendor	= PCI_VENDOR_ID_SIS,
 	.device	= PCI_DEVICE_ID_SIS_SIS966_LPC_5,
 };
-static struct pci_driver lpc_driver_lpc6 __pci_driver = {
+static const struct pci_driver lpc_driver_lpc6 __pci_driver = {
 	.ops	= &lpc_ops,
 	.vendor	= PCI_VENDOR_ID_SIS,
 	.device	= PCI_DEVICE_ID_SIS_SIS966_LPC_6,
@@ -444,7 +444,7 @@ static struct device_operations lpc_slave_ops  = {
 	.ops_pci	= &lops_pci,
 };
 
-static struct pci_driver lpc_driver_slave __pci_driver = {
+static const struct pci_driver lpc_driver_slave __pci_driver = {
 	.ops	= &lpc_slave_ops,
 	.vendor	= PCI_VENDOR_ID_SIS,
 	.device	= PCI_DEVICE_ID_SIS_SIS966_SLAVE,
diff --git a/src/southbridge/sis/sis966/sis966_nic.c b/src/southbridge/sis/sis966/sis966_nic.c
index b40adb5e4b..ce95f7a76b 100644
--- a/src/southbridge/sis/sis966/sis966_nic.c
+++ b/src/southbridge/sis/sis966/sis966_nic.c
@@ -631,12 +631,12 @@ static struct device_operations nic_ops  = {
 //	.enable		= sis966_enable,
 	.ops_pci	= &lops_pci,
 };
-static struct pci_driver nic_driver __pci_driver = {
+static const struct pci_driver nic_driver __pci_driver = {
 	.ops	= &nic_ops,
 	.vendor	= PCI_VENDOR_ID_SIS,
 	.device	= PCI_DEVICE_ID_SIS_SIS966_NIC1,
 };
-static struct pci_driver nic_bridge_driver __pci_driver = {
+static const struct pci_driver nic_bridge_driver __pci_driver = {
 	.ops	= &nic_ops,
 	.vendor	= PCI_VENDOR_ID_SIS,
 	.device	= PCI_DEVICE_ID_SIS_SIS966_NIC_BRIDGE,
diff --git a/src/southbridge/sis/sis966/sis966_pci.c b/src/southbridge/sis/sis966/sis966_pci.c
index db1d986a08..5c618b1b29 100644
--- a/src/southbridge/sis/sis966/sis966_pci.c
+++ b/src/southbridge/sis/sis966/sis966_pci.c
@@ -101,7 +101,7 @@ static struct device_operations pci_ops  = {
 	.ops_pci	= &lops_pci,
 };
 
-static struct pci_driver pci_driver __pci_driver = {
+static const struct pci_driver pci_driver __pci_driver = {
 	.ops	= &pci_ops,
 	.vendor	= PCI_VENDOR_ID_SIS,
 	.device	= PCI_DEVICE_ID_SIS_SIS966_PCI,
diff --git a/src/southbridge/sis/sis966/sis966_pcie.c b/src/southbridge/sis/sis966/sis966_pcie.c
index 3984554378..4b5ccd18f0 100644
--- a/src/southbridge/sis/sis966/sis966_pcie.c
+++ b/src/southbridge/sis/sis966/sis966_pcie.c
@@ -58,27 +58,27 @@ static struct device_operations pcie_ops  = {
 	.ops_pci	= &lops_pci,
 };
 
-static struct pci_driver pciebc_driver __pci_driver = {
+static const struct pci_driver pciebc_driver __pci_driver = {
 	.ops	= &pcie_ops,
 	.vendor	= PCI_VENDOR_ID_SIS,
 	.device	= PCI_DEVICE_ID_SIS_SIS966_PCIE_B_C,
 };
-static struct pci_driver pciee_driver __pci_driver = {
+static const struct pci_driver pciee_driver __pci_driver = {
 	.ops	= &pcie_ops,
 	.vendor	= PCI_VENDOR_ID_SIS,
 	.device	= PCI_DEVICE_ID_SIS_SIS966_PCIE_E,
 };
-static struct pci_driver pciea_driver __pci_driver = {
+static const struct pci_driver pciea_driver __pci_driver = {
 	.ops	= &pcie_ops,
 	.vendor	= PCI_VENDOR_ID_SIS,
 	.device	= PCI_DEVICE_ID_SIS_SIS966_PCIE_A,
 };
-static struct pci_driver pcief_driver __pci_driver = {
+static const struct pci_driver pcief_driver __pci_driver = {
 	.ops	= &pcie_ops,
 	.vendor	= PCI_VENDOR_ID_SIS,
 	.device	= PCI_DEVICE_ID_SIS_SIS966_PCIE_F,
 };
-static struct pci_driver pcied_driver __pci_driver = {
+static const struct pci_driver pcied_driver __pci_driver = {
 	.ops	= &pcie_ops,
 	.vendor	= PCI_VENDOR_ID_SIS,
 	.device	= PCI_DEVICE_ID_SIS_SIS966_PCIE_D,
diff --git a/src/southbridge/sis/sis966/sis966_sata.c b/src/southbridge/sis/sis966/sis966_sata.c
index c495aa5e45..c6254da68c 100644
--- a/src/southbridge/sis/sis966/sis966_sata.c
+++ b/src/southbridge/sis/sis966/sis966_sata.c
@@ -288,13 +288,13 @@ static struct device_operations sata_ops = {
 	.ops_pci	= &lops_pci,
 };
 
-static struct pci_driver sata0_driver __pci_driver = {
+static const struct pci_driver sata0_driver __pci_driver = {
 	.ops	= &sata_ops,
 	.vendor	= PCI_VENDOR_ID_SIS,
 	.device	= PCI_DEVICE_ID_SIS_SIS966_SATA0,
 };
 
-static struct pci_driver sata1_driver __pci_driver = {
+static const struct pci_driver sata1_driver __pci_driver = {
 	.ops	= &sata_ops,
 	.vendor	= PCI_VENDOR_ID_SIS,
 	.device	= PCI_DEVICE_ID_SIS_SIS966_SATA1,
diff --git a/src/southbridge/sis/sis966/sis966_smbus.c b/src/southbridge/sis/sis966/sis966_smbus.c
index 5d1384b440..c06cb9f25c 100644
--- a/src/southbridge/sis/sis966/sis966_smbus.c
+++ b/src/southbridge/sis/sis966/sis966_smbus.c
@@ -146,7 +146,7 @@ static struct device_operations smbus_ops = {
 	.ops_pci	= &lops_pci,
 	.ops_smbus_bus	= &lops_smbus_bus,
 };
-static struct pci_driver smbus_driver __pci_driver = {
+static const struct pci_driver smbus_driver __pci_driver = {
 	.ops	= &smbus_ops,
 	.vendor	= PCI_VENDOR_ID_SIS,
 	.device	= PCI_DEVICE_ID_SIS_SIS966_SM2,
diff --git a/src/southbridge/sis/sis966/sis966_usb.c b/src/southbridge/sis/sis966/sis966_usb.c
index 0cbb68f664..487561fa09 100644
--- a/src/southbridge/sis/sis966/sis966_usb.c
+++ b/src/southbridge/sis/sis966/sis966_usb.c
@@ -107,7 +107,7 @@ static struct device_operations usb_ops = {
 	.ops_pci	= &lops_pci,
 };
 
-static struct pci_driver usb_driver __pci_driver = {
+static const struct pci_driver usb_driver __pci_driver = {
 	.ops	= &usb_ops,
 	.vendor	= PCI_VENDOR_ID_SIS,
 	.device	= PCI_DEVICE_ID_SIS_SIS966_USB,
diff --git a/src/southbridge/sis/sis966/sis966_usb2.c b/src/southbridge/sis/sis966/sis966_usb2.c
index afd31af198..c9e00a908a 100644
--- a/src/southbridge/sis/sis966/sis966_usb2.c
+++ b/src/southbridge/sis/sis966/sis966_usb2.c
@@ -161,7 +161,7 @@ static struct device_operations usb2_ops  = {
 	.ops_pci	= &lops_pci,
 };
 
-static struct pci_driver usb2_driver __pci_driver = {
+static const struct pci_driver usb2_driver __pci_driver = {
 	.ops	= &usb2_ops,
 	.vendor	= PCI_VENDOR_ID_SIS,
 	.device	= PCI_DEVICE_ID_SIS_SIS966_EHCI,
diff --git a/src/southbridge/sis/sis966/sisnb.c b/src/southbridge/sis/sis966/sisnb.c
index c1aa7b3011..8cb1c955b4 100644
--- a/src/southbridge/sis/sis966/sisnb.c
+++ b/src/southbridge/sis/sis966/sisnb.c
@@ -185,7 +185,7 @@ static struct device_operations sisnb_ops  = {
 	.ops_pci          = 0,
 };
 
-static struct pci_driver sisnb_driver __pci_driver = {
+static const struct pci_driver sisnb_driver __pci_driver = {
 	.ops    = &sisnb_ops,
 	.vendor = PCI_VENDOR_ID_SIS,
 	.device = PCI_DEVICE_ID_SIS_SIS761,