Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 102882
b: refs/heads/master
c: 909fa88
h: refs/heads/master
v: v3
  • Loading branch information
Adrian Bunk authored and Jeff Garzik committed Jun 12, 2008
1 parent 40ac5f2 commit 89dec03
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 6 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 0b1140782a68569b859b727de67eecf95a74ab44
refs/heads/master: 909fa882a83a5c73868ba0630654d0018d35252a
8 changes: 3 additions & 5 deletions trunk/drivers/net/mac8390.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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;
Expand All @@ -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;
Expand Down

0 comments on commit 89dec03

Please sign in to comment.