projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
[powerpc.git]
/
drivers
/
net
/
ne.c
diff --git
a/drivers/net/ne.c
b/drivers/net/ne.c
index
963a11f
..
a5c4199
100644
(file)
--- a/
drivers/net/ne.c
+++ b/
drivers/net/ne.c
@@
-160,7
+160,7
@@
static void ne_block_input(struct net_device *dev, int count,
static void ne_block_output(struct net_device *dev, const int count,
const unsigned char *buf, const int start_page);
static void ne_block_output(struct net_device *dev, const int count,
const unsigned char *buf, const int start_page);
-
\f
+
/* Probe for various non-shared-memory ethercards.
NEx000-clone boards have a Station Address PROM (SAPROM) in the packet
/* Probe for various non-shared-memory ethercards.
NEx000-clone boards have a Station Address PROM (SAPROM) in the packet
@@
-807,7
+807,7
@@
retry:
return;
}
return;
}
-
\f
+
#ifdef MODULE
#define MAX_NE_CARDS 4 /* Max number of NE cards per module */
static struct net_device *dev_ne[MAX_NE_CARDS];
#ifdef MODULE
#define MAX_NE_CARDS 4 /* Max number of NE cards per module */
static struct net_device *dev_ne[MAX_NE_CARDS];
@@
-867,7
+867,7
@@
static void cleanup_card(struct net_device *dev)
release_region(dev->base_addr, NE_IO_EXTENT);
}
release_region(dev->base_addr, NE_IO_EXTENT);
}
-void cleanup_module(void)
+void
__exit
cleanup_module(void)
{
int this_dev;
{
int this_dev;