diff options
| author | David S. Miller <davem@davemloft.net> | 2008-06-12 19:14:22 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-06-12 19:14:22 -0400 |
| commit | 030352a9c7715780b2c01033ae9afe56249bb7cc (patch) | |
| tree | cc23683773d0d63712f4e6ea6824383f1d696e05 /drivers/net/atarilance.c | |
| parent | e6e30add6bd8115af108de2a13ec82d997a55777 (diff) | |
| parent | 0c1aa20fb87b796d904f4d89ad12e5a0c483127b (diff) | |
Merge branch 'davem-next' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'drivers/net/atarilance.c')
| -rw-r--r-- | drivers/net/atarilance.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/atarilance.c b/drivers/net/atarilance.c index 4cceaac8863a..0860cc280b01 100644 --- a/drivers/net/atarilance.c +++ b/drivers/net/atarilance.c | |||
| @@ -243,7 +243,7 @@ struct lance_private { | |||
| 243 | 243 | ||
| 244 | /* Possible memory/IO addresses for probing */ | 244 | /* Possible memory/IO addresses for probing */ |
| 245 | 245 | ||
| 246 | struct lance_addr { | 246 | static struct lance_addr { |
| 247 | unsigned long memaddr; | 247 | unsigned long memaddr; |
| 248 | unsigned long ioaddr; | 248 | unsigned long ioaddr; |
| 249 | int slow_flag; | 249 | int slow_flag; |