[PATCH] sis190: fix compile error section type conflict

[PATCH] sis190: fix compile error section type conflict

[Li Zefan]

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

Signed-off-by: Li Zefan <lizf@cn.fujitsu.com>

---
 drivers/net/sis190.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/net/sis190.c b/drivers/net/sis190.c
index b570402..e48e4ad 100644
--- a/drivers/net/sis190.c
+++ b/drivers/net/sis190.c
@@ -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, },
-- 
1.5.4.rc3

Re: [PATCH] sis190: fix compile error section type conflict

[Francois Romieu]

Li Zefan <lizf@cn.fujitsu.com> :
> 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.

Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
Cc: Michael D. Setzer II <mikes@kuentos.guam.net>
Cc: Gabriel C <nix.or.die@googlemail.com>
Cc: Jonas Bonn <jonas@southpole.se>
Cc: Jan Engelhardt <jengelh@computergmbh.de>
Cc: Li Zefan <lizf@cn.fujitsu.com>
---
 drivers/net/sis190.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/net/sis190.c b/drivers/net/sis190.c
index b570402..0a5e024 100644
--- a/drivers/net/sis190.c
+++ b/drivers/net/sis190.c
@@ -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;
-- 
1.5.3.3

Re: [PATCH] sis190: fix compile error section type conflict

[Sam Ravnborg]

On Sat, Feb 02, 2008 at 03:34:58PM +0100, Francois Romieu wrote:
> Li Zefan <lizf@cn.fujitsu.com> :
> > 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:
Acked-by: Sam Ravnborg <sam@ravnborg.org>

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

	Sam