summaryrefslogtreecommitdiffstats
path: root/drivers/net/eexpress.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/eexpress.c')
-rw-r--r--drivers/net/eexpress.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/eexpress.c b/drivers/net/eexpress.c
index 51af63aa4..f8088862e 100644
--- a/drivers/net/eexpress.c
+++ b/drivers/net/eexpress.c
@@ -325,7 +325,7 @@ static inline unsigned short int SHADOW(short int addr)
* checks for presence of EtherExpress card
*/
-__initfunc(int express_probe(struct device *dev))
+int __init express_probe(struct device *dev)
{
unsigned short *port;
static unsigned short ports[] = { 0x300,0x310,0x270,0x320,0x340,0 };
@@ -961,7 +961,7 @@ static void eexp_hw_tx_pio(struct device *dev, unsigned short *buf,
* than one card in a machine.
*/
-__initfunc(static int eexp_hw_probe(struct device *dev, unsigned short ioaddr))
+static int __init eexp_hw_probe(struct device *dev, unsigned short ioaddr)
{
unsigned short hw_addr[3];
unsigned char buswidth;
@@ -1084,8 +1084,8 @@ __initfunc(static int eexp_hw_probe(struct device *dev, unsigned short ioaddr))
* Read a word from the EtherExpress on-board serial EEPROM.
* The EEPROM contains 64 words of 16 bits.
*/
-__initfunc(static unsigned short eexp_hw_readeeprom(unsigned short ioaddr,
- unsigned char location))
+static unsigned short __init eexp_hw_readeeprom(unsigned short ioaddr,
+ unsigned char location)
{
unsigned short cmd = 0x180|(location&0x7f);
unsigned short rval = 0,wval = EC_CS|i586_RST;