Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...

[karo-tx-linux.git] / drivers / net / 3c505.c

diff --git a/drivers/net/3c505.c b/drivers/net/3c505.c
index ad17f17e8e7a0511d9475fb3eb60d648b4cfc51a..111601ca4ca3da97d054cf3a70dfad08da476735 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;