Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756164AbYA3MWP (ORCPT ); Wed, 30 Jan 2008 07:22:15 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1759634AbYA3MV4 (ORCPT ); Wed, 30 Jan 2008 07:21:56 -0500 Received: from pasmtpa.tele.dk ([80.160.77.114]:42491 "EHLO pasmtpA.tele.dk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759586AbYA3MVz (ORCPT ); Wed, 30 Jan 2008 07:21:55 -0500 Date: Wed, 30 Jan 2008 13:21:43 +0100 From: Sam Ravnborg To: Jonas Bonn Cc: netdev@vger.kernel.org, romieu@fr.zoreil.com, linux-kernel@vger.kernel.org Subject: Re: [PATCH] [SIS190] Use _devinitconst for const data Message-ID: <20080130122143.GA21694@uranus.ravnborg.org> References: <20080130112559.GA21346@uranus.ravnborg.org> <1201694236-5007-1-git-send-email-jonas@southpole.se> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1201694236-5007-1-git-send-email-jonas@southpole.se> User-Agent: Mutt/1.4.2.1i Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1808 Lines: 46 On Wed, Jan 30, 2008 at 12:57:16PM +0100, Jonas Bonn wrote: > 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, }, sis190_pci_tbl is not const... > @@ -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 > > > -- > To unsubscribe from this list: send the line "unsubscribe linux-kernel" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > Please read the FAQ at http://www.tux.org/lkml/ -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/