diff options
author | Andrew Morton <akpm@linux-foundation.org> | 2008-02-10 02:41:08 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-02-10 02:41:08 -0500 |
commit | aa738adf89deede805d821feddd5b07999904ffd (patch) | |
tree | 625bdcf3467e6f13b1de952ad0564fbb3fdca801 /drivers/net | |
parent | 952b3494cf9d4ff7f48c13363393cab15cde056f (diff) |
natsemi: section fix
gcc-3.4.4 on powerpc:
drivers/net/natsemi.c:245: error: natsemi_pci_info causes a section type conflict
Cc: Jeff Garzik <jeff@garzik.org>
Cc: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/natsemi.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/natsemi.c b/drivers/net/natsemi.c index 0a3e60418e53..385f69c14387 100644 --- a/drivers/net/natsemi.c +++ b/drivers/net/natsemi.c | |||
@@ -127,7 +127,7 @@ static int full_duplex[MAX_UNITS]; | |||
127 | #define NATSEMI_RX_LIMIT 2046 /* maximum supported by hardware */ | 127 | #define NATSEMI_RX_LIMIT 2046 /* maximum supported by hardware */ |
128 | 128 | ||
129 | /* These identify the driver base version and may not be removed. */ | 129 | /* These identify the driver base version and may not be removed. */ |
130 | static const char version[] __devinitdata = | 130 | static char version[] __devinitdata = |
131 | KERN_INFO DRV_NAME " dp8381x driver, version " | 131 | KERN_INFO DRV_NAME " dp8381x driver, version " |
132 | DRV_VERSION ", " DRV_RELDATE "\n" | 132 | DRV_VERSION ", " DRV_RELDATE "\n" |
133 | KERN_INFO " originally by Donald Becker <becker@scyld.com>\n" | 133 | KERN_INFO " originally by Donald Becker <becker@scyld.com>\n" |
@@ -238,7 +238,7 @@ enum { | |||
238 | }; | 238 | }; |
239 | 239 | ||
240 | /* array of board data directly indexed by pci_tbl[x].driver_data */ | 240 | /* array of board data directly indexed by pci_tbl[x].driver_data */ |
241 | static const struct { | 241 | static struct { |
242 | const char *name; | 242 | const char *name; |
243 | unsigned long flags; | 243 | unsigned long flags; |
244 | unsigned int eeprom_size; | 244 | unsigned int eeprom_size; |
@@ -247,7 +247,7 @@ static const struct { | |||
247 | { "NatSemi DP8381[56]", 0, 24 }, | 247 | { "NatSemi DP8381[56]", 0, 24 }, |
248 | }; | 248 | }; |
249 | 249 | ||
250 | static const struct pci_device_id natsemi_pci_tbl[] __devinitdata = { | 250 | static struct pci_device_id natsemi_pci_tbl[] __devinitdata = { |
251 | { PCI_VENDOR_ID_NS, 0x0020, 0x12d9, 0x000c, 0, 0, 0 }, | 251 | { PCI_VENDOR_ID_NS, 0x0020, 0x12d9, 0x000c, 0, 0, 0 }, |
252 | { PCI_VENDOR_ID_NS, 0x0020, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 1 }, | 252 | { PCI_VENDOR_ID_NS, 0x0020, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 1 }, |
253 | { } /* terminate list */ | 253 | { } /* terminate list */ |