lkml.org 
[lkml]   [2008]   [Jan]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH] [SIS190] Use __devinitconst for const devinit data
    Date
    Mixing const and __section was previously not allowed.  New __devinitconst tag
    allows this.

    This fixes a gcc "section type mismatch" build error.
    ---
    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..d3126a9 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[] __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 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.8



    \
     
     \ /
      Last update: 2008-01-30 14:45    [W:0.025 / U:0.624 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site