Li Zefan [off-list ref] :
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 <redacted>
Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
Cc: Michael D. Setzer II <redacted>
Cc: Gabriel C <redacted>
Cc: Jonas Bonn <jonas@southpole.se>
Cc: Jan Engelhardt <redacted>
Cc: Li Zefan <redacted>
---
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