Home » Mailing list archives » linux-kernel » 2008 » January » 30

[PATCH] [SIS190] Use _devinitconst for const data

!MAILaRCHIVE_VOTE_RePLACE
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
[view in full thread]
From: Jonas Bonn <jonas@...>
To: <netdev@...>, <romieu@...>, <linux-kernel@...>
Cc: Jonas Bonn <jonas@...>
Subject: [PATCH] [SIS190] Use _devinitconst for const data
Date: Wednesday, January 30, 2008 - 7:57 am

This fixes build error as gcc complains about a "section type conflict"
due to the mixing of const and non-const data in same section.
---
 drivers/net/sis190.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/sis190.c b/drivers/net/sis190.c
index b570402..f84c02e 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 struct pci_device_id sis190_pci_tbl[] __devinitconst = {
 	{ PCI_DEVICE(PCI_VENDOR_ID_SI, 0x0190), 0, 0, 0 },
 	{ PCI_DEVICE(PCI_VENDOR_ID_SI, 0x0191), 0, 0, 1 },
 	{ 0, },
@@ -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 u16 __devinitconst ids[] = { 0x0965, 0x0966, 0x0968 };
 	struct sis190_private *tp = netdev_priv(dev);
 	struct pci_dev *isa_bridge;
 	u8 reg, tmp8;
-- 
1.5.3.8


--
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
Messages in current thread:
[PATCH] [SIS190] Constify data marked as __devinitdata, Jonas Bonn, (Wed Jan 30, 6:53 am)
Re: [PATCH] [SIS190] Constify data marked as __devinitdata, Jan Engelhardt, (Wed Jan 30, 7:23 am)
Re: [PATCH] [SIS190] Constify data marked as __devinitdata, Jonas Bonn, (Wed Jan 30, 7:41 am)
Re: [PATCH] [SIS190] Constify data marked as __devinitdata, Sam Ravnborg, (Wed Jan 30, 7:25 am)
Re: [PATCH] [SIS190] Constify data marked as __devinitdata, Jan Engelhardt, (Wed Jan 30, 9:31 am)
Re: [PATCH] [SIS190] Constify data marked as __devinitdata, Sam Ravnborg, (Wed Jan 30, 9:37 am)
[PATCH] [SIS190] Use __devinitconst for const devinit data, Jonas Bonn, (Wed Jan 30, 9:41 am)
[PATCH] [SIS190] Use _devinitconst for const data, Jonas Bonn, (Wed Jan 30, 7:57 am)
Re: [PATCH] [SIS190] Use _devinitconst for const data, Sam Ravnborg, (Wed Jan 30, 8:21 am)