LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Jonas Bonn <jonas@southpole.se>
To: netdev@vger.kernel.org, romieu@fr.zoreil.com,
linux-kernel@vger.kernel.org
Cc: Jonas Bonn <jonas@southpole.se>
Subject: [PATCH] [SIS190] Use _devinitconst for const data
Date: Wed, 30 Jan 2008 12:57:16 +0100 [thread overview]
Message-ID: <1201694236-5007-1-git-send-email-jonas@southpole.se> (raw)
In-Reply-To: <20080130112559.GA21346@uranus.ravnborg.org>
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
next prev parent reply other threads:[~2008-01-30 11:57 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-01-30 10:53 [PATCH] [SIS190] Constify data marked as __devinitdata Jonas Bonn
2008-01-30 11:23 ` Jan Engelhardt
2008-01-30 11:25 ` Sam Ravnborg
2008-01-30 11:57 ` Jonas Bonn [this message]
2008-01-30 12:21 ` [PATCH] [SIS190] Use _devinitconst for const data Sam Ravnborg
2008-01-30 13:31 ` [PATCH] [SIS190] Constify data marked as __devinitdata Jan Engelhardt
2008-01-30 13:37 ` Sam Ravnborg
2008-01-30 13:41 ` [PATCH] [SIS190] Use __devinitconst for const devinit data Jonas Bonn
2008-01-30 11:41 ` [PATCH] [SIS190] Constify data marked as __devinitdata Jonas Bonn
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1201694236-5007-1-git-send-email-jonas@southpole.se \
--to=jonas@southpole.se \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=romieu@fr.zoreil.com \
--subject='Re: [PATCH] [SIS190] Use _devinitconst for const data' \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).