Skip to contentSkip to conversation

sis190: fix compile error section type conflict

PATCH In review Li Zefan 3 participants 3 messages Feb 2, 2008

Subsystems (2)
lore
Share & tools
lore

Li Zefan

author
#0 lore raw

PATCH 1/1 sis190: fix compile error section type conflict

Fix the following compile error:

drivers/net/sis190.c:329: error: sis190_pci_tbl causes a section type conflict make[2]: *** [drivers/net/sis190.o] Error 1
make[1]: *** [drivers/net] Error 2
make: *** [drivers] Error 2

---
 drivers/net/sis190.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/net/sis190.c +1 -1
index b570402..e48e4ad 100644
@@ -326,7 +326,7 @@ static const struct {
 	{ "SiS 191 PCI Gigabit Ethernet adapter" },
 };
 
-static struct pci_device_id sis190_pci_tbl[] __devinitdata = {
+static const struct pci_device_id sis190_pci_tbl[] __devinitdata = {
 	{ PCI_DEVICE(PCI_VENDOR_ID_SI, 0x0190), 0, 0, 0 },
 	{ PCI_DEVICE(PCI_VENDOR_ID_SI, 0x0191), 0, 0, 1 },
 	{ 0, },
Signature · 1 line
1.5.4.rc3
#1 lore raw

Li Zefan <[email protected]> :

Quoted 1 line

Fix the following compile error:

I am not sure that it is the right fix. Please read the archive of this week on l-k.

I'll submit the patch below to Jeff once I have tested it with real hardware (sunday evening entertainment). Sam, is it ok to add your s-o-b to it ?

Subject: [PATCH] sis190: fix section type conflict

The driver already contains __devinitdata which is not const.

Cc Michael D. Setzer II <[email protected]>
Cc Gabriel C <[email protected]>
Cc Jonas Bonn <[email protected]>
Cc Jan Engelhardt <[email protected]>
Cc Li Zefan <[email protected]>
---
 drivers/net/sis190.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/net/sis190.c +1 -1
index b570402..0a5e024 100644
@@ -1556,7 +1556,7 @@ static int __devinit sis190_get_mac_addr_from_eeprom(struct pci_dev *pdev,
 static int __devinit sis190_get_mac_addr_from_apc(struct pci_dev *pdev,
 						  struct net_device *dev)
 {
-	static const u16 __devinitdata ids[] = { 0x0965, 0x0966, 0x0968 };
+	static const u16 __devinitconst ids[] = { 0x0965, 0x0966, 0x0968 };
 	struct sis190_private *tp = netdev_priv(dev);
 	struct pci_dev *isa_bridge;
 	u8 reg, tmp8;
Signature · 1 line
1.5.3.3
Acked-by
#2 lore raw
Quoted 9 lines · Francois Romieu

Li Zefan <[email protected]> :

Quoted 1 line

Fix the following compile error:

I am not sure that it is the right fix. Please read the archive of this week on l-k.

I'll submit the patch below to Jeff once I have tested it with real hardware (sunday evening entertainment). Sam, is it ok to add your s-o-b to it ?

No - a s-o-b document the path of the patch. And it will not hit Jeff via me. Although I know I said ths was to way to do it. But you can add my:

If I posted the patch myself I do not remember - but then the s-o-b would be correct.

Sam