diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2011-06-06 18:10:07 +0200 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2011-06-06 18:10:07 +0200 |
| commit | 8c31b1635b91e48f867e010cd7bcd06393e5858a (patch) | |
| tree | 4981add7e38e24724d255dedeb03f93be34d33ec /drivers/net/ne3210.c | |
| parent | gpio/pca953x.c: Interrupt pin is active-low (diff) | |
| parent | gpio/mxc: convert gpio-mxc to use basic_mmio_gpio library (diff) | |
| download | linux-8c31b1635b91e48f867e010cd7bcd06393e5858a.tar.xz linux-8c31b1635b91e48f867e010cd7bcd06393e5858a.zip | |
Merge branch 'gpio/next-mx' into gpio/next
Diffstat (limited to 'drivers/net/ne3210.c')
| -rw-r--r-- | drivers/net/ne3210.c | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/drivers/net/ne3210.c b/drivers/net/ne3210.c index e8984b0ca521..243ed2aee88e 100644 --- a/drivers/net/ne3210.c +++ b/drivers/net/ne3210.c @@ -80,20 +80,17 @@ static void ne3210_block_output(struct net_device *dev, int count, const unsigne #define NE3210_DEBUG 0x0 -static const unsigned char irq_map[] __devinitconst = - { 15, 12, 11, 10, 9, 7, 5, 3 }; -static const unsigned int shmem_map[] __devinitconst = - { 0xff0, 0xfe0, 0xfff0, 0xd8, 0xffe0, 0xffc0, 0xd0, 0x0 }; -static const char *const ifmap[] __devinitconst = - { "UTP", "?", "BNC", "AUI" }; -static const int ifmap_val[] __devinitconst = { +static unsigned char irq_map[] __initdata = {15, 12, 11, 10, 9, 7, 5, 3}; +static unsigned int shmem_map[] __initdata = {0xff0, 0xfe0, 0xfff0, 0xd8, 0xffe0, 0xffc0, 0xd0, 0x0}; +static const char *ifmap[] __initdata = {"UTP", "?", "BNC", "AUI"}; +static int ifmap_val[] __initdata = { IF_PORT_10BASET, IF_PORT_UNKNOWN, IF_PORT_10BASE2, IF_PORT_AUI, }; -static int __devinit ne3210_eisa_probe (struct device *device) +static int __init ne3210_eisa_probe (struct device *device) { unsigned long ioaddr, phys_mem; int i, retval, port_index; @@ -316,7 +313,7 @@ static void ne3210_block_output(struct net_device *dev, int count, memcpy_toio(shmem, buf, count); } -static const struct eisa_device_id ne3210_ids[] __devinitconst = { +static struct eisa_device_id ne3210_ids[] = { { "EGL0101" }, { "NVL1801" }, { "" }, |