diff options
author | Haavard Skinnemoen <haavard.skinnemoen@atmel.com> | 2008-07-27 13:54:08 +0200 |
---|---|---|
committer | Haavard Skinnemoen <haavard.skinnemoen@atmel.com> | 2008-07-27 13:54:08 +0200 |
commit | eda3d8f5604860aae1bb9996bb5efc4213778369 (patch) | |
tree | 9d3887d2665bcc5f5abf200758794545c7b2c69b /drivers/net/mac8390.c | |
parent | 87a9f704658a40940e740b1d73d861667e9164d3 (diff) | |
parent | 8be1a6d6c77ab4532e4476fdb8177030ef48b52c (diff) |
Merge commit 'upstream/master'
Diffstat (limited to 'drivers/net/mac8390.c')
-rw-r--r-- | drivers/net/mac8390.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/net/mac8390.c b/drivers/net/mac8390.c index 9e700749bb3..98e3eb2697c 100644 --- a/drivers/net/mac8390.c +++ b/drivers/net/mac8390.c @@ -117,8 +117,6 @@ enum mac8390_access { ACCESS_16, }; -extern enum mac8390_type mac8390_ident(struct nubus_dev * dev); -extern int mac8390_memsize(unsigned long membase); extern int mac8390_memtest(struct net_device * dev); static int mac8390_initdev(struct net_device * dev, struct nubus_dev * ndev, enum mac8390_type type); @@ -163,7 +161,7 @@ static void slow_sane_block_output(struct net_device *dev, int count, static void word_memcpy_tocard(void *tp, const void *fp, int count); static void word_memcpy_fromcard(void *tp, const void *fp, int count); -enum mac8390_type __init mac8390_ident(struct nubus_dev * dev) +static enum mac8390_type __init mac8390_ident(struct nubus_dev *dev) { switch (dev->dr_sw) { case NUBUS_DRSW_3COM: @@ -234,7 +232,7 @@ enum mac8390_type __init mac8390_ident(struct nubus_dev * dev) return MAC8390_NONE; } -enum mac8390_access __init mac8390_testio(volatile unsigned long membase) +static enum mac8390_access __init mac8390_testio(volatile unsigned long membase) { unsigned long outdata = 0xA5A0B5B0; unsigned long indata = 0x00000000; @@ -252,7 +250,7 @@ enum mac8390_access __init mac8390_testio(volatile unsigned long membase) return ACCESS_UNKNOWN; } -int __init mac8390_memsize(unsigned long membase) +static int __init mac8390_memsize(unsigned long membase) { unsigned long flags; int i, j; |