提交 aa738adf 编写于 作者: A Andrew Morton 提交者: David S. Miller

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: NAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>
上级 952b3494
...@@ -127,7 +127,7 @@ static int full_duplex[MAX_UNITS]; ...@@ -127,7 +127,7 @@ static int full_duplex[MAX_UNITS];
#define NATSEMI_RX_LIMIT 2046 /* maximum supported by hardware */ #define NATSEMI_RX_LIMIT 2046 /* maximum supported by hardware */
/* These identify the driver base version and may not be removed. */ /* These identify the driver base version and may not be removed. */
static const char version[] __devinitdata = static char version[] __devinitdata =
KERN_INFO DRV_NAME " dp8381x driver, version " KERN_INFO DRV_NAME " dp8381x driver, version "
DRV_VERSION ", " DRV_RELDATE "\n" DRV_VERSION ", " DRV_RELDATE "\n"
KERN_INFO " originally by Donald Becker <becker@scyld.com>\n" KERN_INFO " originally by Donald Becker <becker@scyld.com>\n"
...@@ -238,7 +238,7 @@ enum { ...@@ -238,7 +238,7 @@ enum {
}; };
/* array of board data directly indexed by pci_tbl[x].driver_data */ /* array of board data directly indexed by pci_tbl[x].driver_data */
static const struct { static struct {
const char *name; const char *name;
unsigned long flags; unsigned long flags;
unsigned int eeprom_size; unsigned int eeprom_size;
...@@ -247,7 +247,7 @@ static const struct { ...@@ -247,7 +247,7 @@ static const struct {
{ "NatSemi DP8381[56]", 0, 24 }, { "NatSemi DP8381[56]", 0, 24 },
}; };
static const struct pci_device_id natsemi_pci_tbl[] __devinitdata = { static struct pci_device_id natsemi_pci_tbl[] __devinitdata = {
{ PCI_VENDOR_ID_NS, 0x0020, 0x12d9, 0x000c, 0, 0, 0 }, { PCI_VENDOR_ID_NS, 0x0020, 0x12d9, 0x000c, 0, 0, 0 },
{ PCI_VENDOR_ID_NS, 0x0020, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 1 }, { PCI_VENDOR_ID_NS, 0x0020, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 1 },
{ } /* terminate list */ { } /* terminate list */
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册