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/davem/net-2.6
[powerpc.git]
/
drivers
/
net
/
3c505.c
diff --git
a/drivers/net/3c505.c
b/drivers/net/3c505.c
index
ad17f17
..
111601c
100644
(file)
--- a/
drivers/net/3c505.c
+++ b/
drivers/net/3c505.c
@@
-272,7
+272,7
@@
static inline void set_hsf(struct net_device *dev, int hsf)
static int start_receive(struct net_device *, pcb_struct *);
-
inline static
void adapter_reset(struct net_device *dev)
+
static inline
void adapter_reset(struct net_device *dev)
{
unsigned long timeout;
elp_device *adapter = dev->priv;