Revert "net: fix section mismatches"
This reverts commit e5cb966c08.
It causes new build regressions with gcc-4.2 which is
pretty common on non-x86 platforms.
Reported-by: James Bottomley <James.Bottomley@HansenPartnership.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller
parent
930a6eac9f
commit
948252cb9e
10 changed files with 68 additions and 72 deletions
|
|
@ -185,7 +185,7 @@ static int max_interrupt_work = 10;
|
|||
static int nopnp;
|
||||
#endif
|
||||
|
||||
static int el3_common_init(struct net_device *dev);
|
||||
static int __devinit el3_common_init(struct net_device *dev);
|
||||
static void el3_common_remove(struct net_device *dev);
|
||||
static ushort id_read_eeprom(int index);
|
||||
static ushort read_eeprom(int ioaddr, int index);
|
||||
|
|
@ -395,7 +395,7 @@ static struct isa_driver el3_isa_driver = {
|
|||
static int isa_registered;
|
||||
|
||||
#ifdef CONFIG_PNP
|
||||
static const struct pnp_device_id el3_pnp_ids[] __devinitconst = {
|
||||
static struct pnp_device_id el3_pnp_ids[] = {
|
||||
{ .id = "TCM5090" }, /* 3Com Etherlink III (TP) */
|
||||
{ .id = "TCM5091" }, /* 3Com Etherlink III */
|
||||
{ .id = "TCM5094" }, /* 3Com Etherlink III (combo) */
|
||||
|
|
@ -478,7 +478,7 @@ static int pnp_registered;
|
|||
#endif /* CONFIG_PNP */
|
||||
|
||||
#ifdef CONFIG_EISA
|
||||
static const struct eisa_device_id el3_eisa_ids[] __devinitconst = {
|
||||
static struct eisa_device_id el3_eisa_ids[] = {
|
||||
{ "TCM5090" },
|
||||
{ "TCM5091" },
|
||||
{ "TCM5092" },
|
||||
|
|
@ -508,7 +508,7 @@ static int eisa_registered;
|
|||
#ifdef CONFIG_MCA
|
||||
static int el3_mca_probe(struct device *dev);
|
||||
|
||||
static const short el3_mca_adapter_ids[] __devinitconst = {
|
||||
static short el3_mca_adapter_ids[] __initdata = {
|
||||
0x627c,
|
||||
0x627d,
|
||||
0x62db,
|
||||
|
|
@ -517,7 +517,7 @@ static const short el3_mca_adapter_ids[] __devinitconst = {
|
|||
0x0000
|
||||
};
|
||||
|
||||
static const char *const el3_mca_adapter_names[] __devinitconst = {
|
||||
static char *el3_mca_adapter_names[] __initdata = {
|
||||
"3Com 3c529 EtherLink III (10base2)",
|
||||
"3Com 3c529 EtherLink III (10baseT)",
|
||||
"3Com 3c529 EtherLink III (test mode)",
|
||||
|
|
@ -601,7 +601,7 @@ static void el3_common_remove (struct net_device *dev)
|
|||
}
|
||||
|
||||
#ifdef CONFIG_MCA
|
||||
static int __devinit el3_mca_probe(struct device *device)
|
||||
static int __init el3_mca_probe(struct device *device)
|
||||
{
|
||||
/* Based on Erik Nygren's (nygren@mit.edu) 3c529 patch,
|
||||
* heavily modified by Chris Beauregard
|
||||
|
|
@ -671,7 +671,7 @@ static int __devinit el3_mca_probe(struct device *device)
|
|||
#endif /* CONFIG_MCA */
|
||||
|
||||
#ifdef CONFIG_EISA
|
||||
static int __devinit el3_eisa_probe (struct device *device)
|
||||
static int __init el3_eisa_probe (struct device *device)
|
||||
{
|
||||
short i;
|
||||
int ioaddr, irq, if_port;
|
||||
|
|
|
|||
|
|
@ -901,14 +901,14 @@ static const struct dev_pm_ops vortex_pm_ops = {
|
|||
#endif /* !CONFIG_PM */
|
||||
|
||||
#ifdef CONFIG_EISA
|
||||
static const struct eisa_device_id vortex_eisa_ids[] __devinitconst = {
|
||||
static struct eisa_device_id vortex_eisa_ids[] = {
|
||||
{ "TCM5920", CH_3C592 },
|
||||
{ "TCM5970", CH_3C597 },
|
||||
{ "" }
|
||||
};
|
||||
MODULE_DEVICE_TABLE(eisa, vortex_eisa_ids);
|
||||
|
||||
static int __devinit vortex_eisa_probe(struct device *device)
|
||||
static int __init vortex_eisa_probe(struct device *device)
|
||||
{
|
||||
void __iomem *ioaddr;
|
||||
struct eisa_device *edev;
|
||||
|
|
|
|||
|
|
@ -331,18 +331,18 @@ static struct {
|
|||
"DE422",\
|
||||
""}
|
||||
|
||||
static const char* const depca_signature[] __devinitconst = DEPCA_SIGNATURE;
|
||||
static char* __initdata depca_signature[] = DEPCA_SIGNATURE;
|
||||
|
||||
enum depca_type {
|
||||
DEPCA, de100, de101, de200, de201, de202, de210, de212, de422, unknown
|
||||
};
|
||||
|
||||
static const char depca_string[] = "depca";
|
||||
static char depca_string[] = "depca";
|
||||
|
||||
static int depca_device_remove (struct device *device);
|
||||
|
||||
#ifdef CONFIG_EISA
|
||||
static const struct eisa_device_id depca_eisa_ids[] __devinitconst = {
|
||||
static struct eisa_device_id depca_eisa_ids[] = {
|
||||
{ "DEC4220", de422 },
|
||||
{ "" }
|
||||
};
|
||||
|
|
@ -367,19 +367,19 @@ static struct eisa_driver depca_eisa_driver = {
|
|||
#define DE210_ID 0x628d
|
||||
#define DE212_ID 0x6def
|
||||
|
||||
static const short depca_mca_adapter_ids[] __devinitconst = {
|
||||
static short depca_mca_adapter_ids[] = {
|
||||
DE210_ID,
|
||||
DE212_ID,
|
||||
0x0000
|
||||
};
|
||||
|
||||
static const char *depca_mca_adapter_name[] = {
|
||||
static char *depca_mca_adapter_name[] = {
|
||||
"DEC EtherWORKS MC Adapter (DE210)",
|
||||
"DEC EtherWORKS MC Adapter (DE212)",
|
||||
NULL
|
||||
};
|
||||
|
||||
static const enum depca_type depca_mca_adapter_type[] = {
|
||||
static enum depca_type depca_mca_adapter_type[] = {
|
||||
de210,
|
||||
de212,
|
||||
0
|
||||
|
|
@ -541,9 +541,10 @@ static void SetMulticastFilter(struct net_device *dev);
|
|||
static int load_packet(struct net_device *dev, struct sk_buff *skb);
|
||||
static void depca_dbg_open(struct net_device *dev);
|
||||
|
||||
static const u_char de1xx_irq[] __devinitconst = { 2, 3, 4, 5, 7, 9, 0 };
|
||||
static const u_char de2xx_irq[] __devinitconst = { 5, 9, 10, 11, 15, 0 };
|
||||
static const u_char de422_irq[] __devinitconst = { 5, 9, 10, 11, 0 };
|
||||
static u_char de1xx_irq[] __initdata = { 2, 3, 4, 5, 7, 9, 0 };
|
||||
static u_char de2xx_irq[] __initdata = { 5, 9, 10, 11, 15, 0 };
|
||||
static u_char de422_irq[] __initdata = { 5, 9, 10, 11, 0 };
|
||||
static u_char *depca_irq;
|
||||
|
||||
static int irq;
|
||||
static int io;
|
||||
|
|
@ -579,7 +580,7 @@ static const struct net_device_ops depca_netdev_ops = {
|
|||
.ndo_validate_addr = eth_validate_addr,
|
||||
};
|
||||
|
||||
static int __devinit depca_hw_init (struct net_device *dev, struct device *device)
|
||||
static int __init depca_hw_init (struct net_device *dev, struct device *device)
|
||||
{
|
||||
struct depca_private *lp;
|
||||
int i, j, offset, netRAM, mem_len, status = 0;
|
||||
|
|
@ -747,7 +748,6 @@ static int __devinit depca_hw_init (struct net_device *dev, struct device *devic
|
|||
if (dev->irq < 2) {
|
||||
unsigned char irqnum;
|
||||
unsigned long irq_mask, delay;
|
||||
const u_char *depca_irq;
|
||||
|
||||
irq_mask = probe_irq_on();
|
||||
|
||||
|
|
@ -770,7 +770,6 @@ static int __devinit depca_hw_init (struct net_device *dev, struct device *devic
|
|||
break;
|
||||
|
||||
default:
|
||||
depca_irq = NULL;
|
||||
break; /* Not reached */
|
||||
}
|
||||
|
||||
|
|
@ -1303,7 +1302,7 @@ static void SetMulticastFilter(struct net_device *dev)
|
|||
}
|
||||
}
|
||||
|
||||
static int __devinit depca_common_init (u_long ioaddr, struct net_device **devp)
|
||||
static int __init depca_common_init (u_long ioaddr, struct net_device **devp)
|
||||
{
|
||||
int status = 0;
|
||||
|
||||
|
|
@ -1334,7 +1333,7 @@ static int __devinit depca_common_init (u_long ioaddr, struct net_device **devp)
|
|||
/*
|
||||
** Microchannel bus I/O device probe
|
||||
*/
|
||||
static int __devinit depca_mca_probe(struct device *device)
|
||||
static int __init depca_mca_probe(struct device *device)
|
||||
{
|
||||
unsigned char pos[2];
|
||||
unsigned char where;
|
||||
|
|
@ -1458,7 +1457,7 @@ static int __devinit depca_mca_probe(struct device *device)
|
|||
** ISA bus I/O device probe
|
||||
*/
|
||||
|
||||
static void __devinit depca_platform_probe (void)
|
||||
static void __init depca_platform_probe (void)
|
||||
{
|
||||
int i;
|
||||
struct platform_device *pldev;
|
||||
|
|
@ -1498,7 +1497,7 @@ static void __devinit depca_platform_probe (void)
|
|||
}
|
||||
}
|
||||
|
||||
static enum depca_type __devinit depca_shmem_probe (ulong *mem_start)
|
||||
static enum depca_type __init depca_shmem_probe (ulong *mem_start)
|
||||
{
|
||||
u_long mem_base[] = DEPCA_RAM_BASE_ADDRESSES;
|
||||
enum depca_type adapter = unknown;
|
||||
|
|
@ -1559,7 +1558,7 @@ static int __devinit depca_isa_probe (struct platform_device *device)
|
|||
*/
|
||||
|
||||
#ifdef CONFIG_EISA
|
||||
static int __devinit depca_eisa_probe (struct device *device)
|
||||
static int __init depca_eisa_probe (struct device *device)
|
||||
{
|
||||
enum depca_type adapter = unknown;
|
||||
struct eisa_device *edev;
|
||||
|
|
@ -1630,7 +1629,7 @@ static int __devexit depca_device_remove (struct device *device)
|
|||
** and Boot (readb) ROM. This will also give us a clue to the network RAM
|
||||
** base address.
|
||||
*/
|
||||
static int __devinit DepcaSignature(char *name, u_long base_addr)
|
||||
static int __init DepcaSignature(char *name, u_long base_addr)
|
||||
{
|
||||
u_int i, j, k;
|
||||
void __iomem *ptr;
|
||||
|
|
|
|||
|
|
@ -188,14 +188,14 @@ struct hp100_private {
|
|||
* variables
|
||||
*/
|
||||
#ifdef CONFIG_ISA
|
||||
static const char *const hp100_isa_tbl[] __devinitconst = {
|
||||
static const char *hp100_isa_tbl[] = {
|
||||
"HWPF150", /* HP J2573 rev A */
|
||||
"HWP1950", /* HP J2573 */
|
||||
};
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_EISA
|
||||
static const struct eisa_device_id hp100_eisa_tbl[] __devinitconst = {
|
||||
static struct eisa_device_id hp100_eisa_tbl[] = {
|
||||
{ "HWPF180" }, /* HP J2577 rev A */
|
||||
{ "HWP1920" }, /* HP 27248B */
|
||||
{ "HWP1940" }, /* HP J2577 */
|
||||
|
|
@ -336,7 +336,7 @@ static __devinit const char *hp100_read_id(int ioaddr)
|
|||
}
|
||||
|
||||
#ifdef CONFIG_ISA
|
||||
static __devinit int hp100_isa_probe1(struct net_device *dev, int ioaddr)
|
||||
static __init int hp100_isa_probe1(struct net_device *dev, int ioaddr)
|
||||
{
|
||||
const char *sig;
|
||||
int i;
|
||||
|
|
@ -372,7 +372,7 @@ static __devinit int hp100_isa_probe1(struct net_device *dev, int ioaddr)
|
|||
* EISA and PCI are handled by device infrastructure.
|
||||
*/
|
||||
|
||||
static int __devinit hp100_isa_probe(struct net_device *dev, int addr)
|
||||
static int __init hp100_isa_probe(struct net_device *dev, int addr)
|
||||
{
|
||||
int err = -ENODEV;
|
||||
|
||||
|
|
@ -396,7 +396,7 @@ static int __devinit hp100_isa_probe(struct net_device *dev, int addr)
|
|||
#endif /* CONFIG_ISA */
|
||||
|
||||
#if !defined(MODULE) && defined(CONFIG_ISA)
|
||||
struct net_device * __devinit hp100_probe(int unit)
|
||||
struct net_device * __init hp100_probe(int unit)
|
||||
{
|
||||
struct net_device *dev = alloc_etherdev(sizeof(struct hp100_private));
|
||||
int err;
|
||||
|
|
@ -2843,7 +2843,7 @@ static void cleanup_dev(struct net_device *d)
|
|||
}
|
||||
|
||||
#ifdef CONFIG_EISA
|
||||
static int __devinit hp100_eisa_probe (struct device *gendev)
|
||||
static int __init hp100_eisa_probe (struct device *gendev)
|
||||
{
|
||||
struct net_device *dev = alloc_etherdev(sizeof(struct hp100_private));
|
||||
struct eisa_device *edev = to_eisa_device(gendev);
|
||||
|
|
|
|||
|
|
@ -895,12 +895,12 @@ static int ibmlana_irq;
|
|||
static int ibmlana_io;
|
||||
static int startslot; /* counts through slots when probing multiple devices */
|
||||
|
||||
static const short ibmlana_adapter_ids[] __devinitconst = {
|
||||
static short ibmlana_adapter_ids[] __initdata = {
|
||||
IBM_LANA_ID,
|
||||
0x0000
|
||||
};
|
||||
|
||||
static const char *const ibmlana_adapter_names[] __devinitconst = {
|
||||
static char *ibmlana_adapter_names[] __devinitdata = {
|
||||
"IBM LAN Adapter/A",
|
||||
NULL
|
||||
};
|
||||
|
|
|
|||
|
|
@ -222,19 +222,19 @@ static void smsc_ircc_set_transceiver_for_speed(struct smsc_ircc_cb *self, u32 s
|
|||
static void smsc_ircc_sir_wait_hw_transmitter_finish(struct smsc_ircc_cb *self);
|
||||
|
||||
/* Probing */
|
||||
static int smsc_ircc_look_for_chips(void);
|
||||
static const struct smsc_chip * smsc_ircc_probe(unsigned short cfg_base, u8 reg, const struct smsc_chip *chip, char *type);
|
||||
static int smsc_superio_flat(const struct smsc_chip *chips, unsigned short cfg_base, char *type);
|
||||
static int smsc_superio_paged(const struct smsc_chip *chips, unsigned short cfg_base, char *type);
|
||||
static int smsc_superio_fdc(unsigned short cfg_base);
|
||||
static int smsc_superio_lpc(unsigned short cfg_base);
|
||||
static int __init smsc_ircc_look_for_chips(void);
|
||||
static const struct smsc_chip * __init smsc_ircc_probe(unsigned short cfg_base, u8 reg, const struct smsc_chip *chip, char *type);
|
||||
static int __init smsc_superio_flat(const struct smsc_chip *chips, unsigned short cfg_base, char *type);
|
||||
static int __init smsc_superio_paged(const struct smsc_chip *chips, unsigned short cfg_base, char *type);
|
||||
static int __init smsc_superio_fdc(unsigned short cfg_base);
|
||||
static int __init smsc_superio_lpc(unsigned short cfg_base);
|
||||
#ifdef CONFIG_PCI
|
||||
static int preconfigure_smsc_chip(struct smsc_ircc_subsystem_configuration *conf);
|
||||
static int preconfigure_through_82801(struct pci_dev *dev, struct smsc_ircc_subsystem_configuration *conf);
|
||||
static void preconfigure_ali_port(struct pci_dev *dev,
|
||||
static int __init preconfigure_smsc_chip(struct smsc_ircc_subsystem_configuration *conf);
|
||||
static int __init preconfigure_through_82801(struct pci_dev *dev, struct smsc_ircc_subsystem_configuration *conf);
|
||||
static void __init preconfigure_ali_port(struct pci_dev *dev,
|
||||
unsigned short port);
|
||||
static int preconfigure_through_ali(struct pci_dev *dev, struct smsc_ircc_subsystem_configuration *conf);
|
||||
static int smsc_ircc_preconfigure_subsystems(unsigned short ircc_cfg,
|
||||
static int __init preconfigure_through_ali(struct pci_dev *dev, struct smsc_ircc_subsystem_configuration *conf);
|
||||
static int __init smsc_ircc_preconfigure_subsystems(unsigned short ircc_cfg,
|
||||
unsigned short ircc_fir,
|
||||
unsigned short ircc_sir,
|
||||
unsigned char ircc_dma,
|
||||
|
|
@ -366,7 +366,7 @@ static inline void register_bank(int iobase, int bank)
|
|||
}
|
||||
|
||||
/* PNP hotplug support */
|
||||
static const struct pnp_device_id smsc_ircc_pnp_table[] __devinitconst = {
|
||||
static const struct pnp_device_id smsc_ircc_pnp_table[] = {
|
||||
{ .id = "SMCf010", .driver_data = 0 },
|
||||
/* and presumably others */
|
||||
{ }
|
||||
|
|
@ -515,7 +515,7 @@ static const struct net_device_ops smsc_ircc_netdev_ops = {
|
|||
* Try to open driver instance
|
||||
*
|
||||
*/
|
||||
static int __devinit smsc_ircc_open(unsigned int fir_base, unsigned int sir_base, u8 dma, u8 irq)
|
||||
static int __init smsc_ircc_open(unsigned int fir_base, unsigned int sir_base, u8 dma, u8 irq)
|
||||
{
|
||||
struct smsc_ircc_cb *self;
|
||||
struct net_device *dev;
|
||||
|
|
@ -2273,7 +2273,7 @@ static int __init smsc_superio_paged(const struct smsc_chip *chips, unsigned sho
|
|||
}
|
||||
|
||||
|
||||
static int __devinit smsc_access(unsigned short cfg_base, unsigned char reg)
|
||||
static int __init smsc_access(unsigned short cfg_base, unsigned char reg)
|
||||
{
|
||||
IRDA_DEBUG(1, "%s\n", __func__);
|
||||
|
||||
|
|
@ -2281,7 +2281,7 @@ static int __devinit smsc_access(unsigned short cfg_base, unsigned char reg)
|
|||
return inb(cfg_base) != reg ? -1 : 0;
|
||||
}
|
||||
|
||||
static const struct smsc_chip * __devinit smsc_ircc_probe(unsigned short cfg_base, u8 reg, const struct smsc_chip *chip, char *type)
|
||||
static const struct smsc_chip * __init smsc_ircc_probe(unsigned short cfg_base, u8 reg, const struct smsc_chip *chip, char *type)
|
||||
{
|
||||
u8 devid, xdevid, rev;
|
||||
|
||||
|
|
@ -2406,7 +2406,7 @@ static int __init smsc_superio_lpc(unsigned short cfg_base)
|
|||
#ifdef CONFIG_PCI
|
||||
#define PCIID_VENDOR_INTEL 0x8086
|
||||
#define PCIID_VENDOR_ALI 0x10b9
|
||||
static const struct smsc_ircc_subsystem_configuration subsystem_configurations[] __devinitconst = {
|
||||
static struct smsc_ircc_subsystem_configuration subsystem_configurations[] __initdata = {
|
||||
/*
|
||||
* Subsystems needing entries:
|
||||
* 0x10b9:0x1533 0x103c:0x0850 HP nx9010 family
|
||||
|
|
@ -2532,7 +2532,7 @@ static const struct smsc_ircc_subsystem_configuration subsystem_configurations[]
|
|||
* (FIR port, SIR port, FIR DMA, FIR IRQ)
|
||||
* through the chip configuration port.
|
||||
*/
|
||||
static int __devinit preconfigure_smsc_chip(struct
|
||||
static int __init preconfigure_smsc_chip(struct
|
||||
smsc_ircc_subsystem_configuration
|
||||
*conf)
|
||||
{
|
||||
|
|
@ -2633,7 +2633,7 @@ static int __devinit preconfigure_smsc_chip(struct
|
|||
* or Intel 82801DB/DBL (ICH4/ICH4-L) LPC Interface Bridge.
|
||||
* They all work the same way!
|
||||
*/
|
||||
static int __devinit preconfigure_through_82801(struct pci_dev *dev,
|
||||
static int __init preconfigure_through_82801(struct pci_dev *dev,
|
||||
struct
|
||||
smsc_ircc_subsystem_configuration
|
||||
*conf)
|
||||
|
|
@ -2786,7 +2786,7 @@ static int __devinit preconfigure_through_82801(struct pci_dev *dev,
|
|||
* This is based on reverse-engineering since ALi does not
|
||||
* provide any data sheet for the 1533 chip.
|
||||
*/
|
||||
static void __devinit preconfigure_ali_port(struct pci_dev *dev,
|
||||
static void __init preconfigure_ali_port(struct pci_dev *dev,
|
||||
unsigned short port)
|
||||
{
|
||||
unsigned char reg;
|
||||
|
|
@ -2824,7 +2824,7 @@ static void __devinit preconfigure_ali_port(struct pci_dev *dev,
|
|||
IRDA_MESSAGE("Activated ALi 1533 ISA bridge port 0x%04x.\n", port);
|
||||
}
|
||||
|
||||
static int __devinit preconfigure_through_ali(struct pci_dev *dev,
|
||||
static int __init preconfigure_through_ali(struct pci_dev *dev,
|
||||
struct
|
||||
smsc_ircc_subsystem_configuration
|
||||
*conf)
|
||||
|
|
@ -2837,7 +2837,7 @@ static int __devinit preconfigure_through_ali(struct pci_dev *dev,
|
|||
return preconfigure_smsc_chip(conf);
|
||||
}
|
||||
|
||||
static int __devinit smsc_ircc_preconfigure_subsystems(unsigned short ircc_cfg,
|
||||
static int __init smsc_ircc_preconfigure_subsystems(unsigned short ircc_cfg,
|
||||
unsigned short ircc_fir,
|
||||
unsigned short ircc_sir,
|
||||
unsigned char ircc_dma,
|
||||
|
|
@ -2849,7 +2849,7 @@ static int __devinit smsc_ircc_preconfigure_subsystems(unsigned short ircc_cfg,
|
|||
int ret = 0;
|
||||
|
||||
for_each_pci_dev(dev) {
|
||||
const struct smsc_ircc_subsystem_configuration *conf;
|
||||
struct smsc_ircc_subsystem_configuration *conf;
|
||||
|
||||
/*
|
||||
* Cache the subsystem vendor/device:
|
||||
|
|
|
|||
|
|
@ -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" },
|
||||
{ "" },
|
||||
|
|
|
|||
|
|
@ -156,7 +156,7 @@ static const struct {
|
|||
{ 14, 15 }
|
||||
};
|
||||
|
||||
static const short smc_mca_adapter_ids[] __devinitconst = {
|
||||
static short smc_mca_adapter_ids[] __initdata = {
|
||||
0x61c8,
|
||||
0x61c9,
|
||||
0x6fc0,
|
||||
|
|
@ -168,7 +168,7 @@ static const short smc_mca_adapter_ids[] __devinitconst = {
|
|||
0x0000
|
||||
};
|
||||
|
||||
static const char *const smc_mca_adapter_names[] __devinitconst = {
|
||||
static char *smc_mca_adapter_names[] __initdata = {
|
||||
"SMC Ethercard PLUS Elite/A BNC/AUI (WD8013EP/A)",
|
||||
"SMC Ethercard PLUS Elite/A UTP/AUI (WD8013WP/A)",
|
||||
"WD Ethercard PLUS/A (WD8003E/A or WD8003ET/A)",
|
||||
|
|
@ -199,7 +199,7 @@ static const struct net_device_ops ultramca_netdev_ops = {
|
|||
#endif
|
||||
};
|
||||
|
||||
static int __devinit ultramca_probe(struct device *gen_dev)
|
||||
static int __init ultramca_probe(struct device *gen_dev)
|
||||
{
|
||||
unsigned short ioaddr;
|
||||
struct net_device *dev;
|
||||
|
|
|
|||
|
|
@ -727,7 +727,7 @@ static int __devexit madgemc_remove(struct device *device)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static const short madgemc_adapter_ids[] __devinitconst = {
|
||||
static short madgemc_adapter_ids[] __initdata = {
|
||||
0x002d,
|
||||
0x0000
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1995,7 +1995,7 @@ SetMulticastFilter(struct net_device *dev)
|
|||
|
||||
static u_char de4x5_irq[] = EISA_ALLOWED_IRQ_LIST;
|
||||
|
||||
static int __devinit de4x5_eisa_probe (struct device *gendev)
|
||||
static int __init de4x5_eisa_probe (struct device *gendev)
|
||||
{
|
||||
struct eisa_device *edev;
|
||||
u_long iobase;
|
||||
|
|
@ -2097,7 +2097,7 @@ static int __devexit de4x5_eisa_remove (struct device *device)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static const struct eisa_device_id de4x5_eisa_ids[] __devinitconst = {
|
||||
static struct eisa_device_id de4x5_eisa_ids[] = {
|
||||
{ "DEC4250", 0 }, /* 0 is the board name index... */
|
||||
{ "" }
|
||||
};
|
||||
|
|
|
|||
Loading…
Reference in a new issue