From: Nick Orlov <bugfixer@list.ru>
e1000 fixes for gcc-3.4.1
Signed-off-by: Andrew Morton <akpm@osdl.org>
---
25-sparc64-akpm/drivers/net/e1000/e1000_main.c | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff -puN drivers/net/e1000/e1000_main.c~e1000-inlining-fix drivers/net/e1000/e1000_main.c
--- 25-sparc64/drivers/net/e1000/e1000_main.c~e1000-inlining-fix 2004-07-31 20:57:46.544184168 -0700
+++ 25-sparc64-akpm/drivers/net/e1000/e1000_main.c 2004-07-31 20:57:46.549183408 -0700
@@ -128,7 +128,7 @@ static int e1000_xmit_frame(struct sk_bu
static struct net_device_stats * e1000_get_stats(struct net_device *netdev);
static int e1000_change_mtu(struct net_device *netdev, int new_mtu);
static int e1000_set_mac(struct net_device *netdev, void *p);
-static inline void e1000_irq_disable(struct e1000_adapter *adapter);
+static void e1000_irq_disable(struct e1000_adapter *adapter);
static void e1000_irq_enable(struct e1000_adapter *adapter);
static irqreturn_t e1000_intr(int irq, void *data, struct pt_regs *regs);
static boolean_t e1000_clean_tx_irq(struct e1000_adapter *adapter);
@@ -146,9 +146,9 @@ static int e1000_mii_ioctl(struct net_de
void set_ethtool_ops(struct net_device *netdev);
static void e1000_enter_82542_rst(struct e1000_adapter *adapter);
static void e1000_leave_82542_rst(struct e1000_adapter *adapter);
-static inline void e1000_rx_checksum(struct e1000_adapter *adapter,
- struct e1000_rx_desc *rx_desc,
- struct sk_buff *skb);
+static void e1000_rx_checksum(struct e1000_adapter *adapter,
+ struct e1000_rx_desc *rx_desc,
+ struct sk_buff *skb);
static void e1000_tx_timeout(struct net_device *dev);
static void e1000_tx_timeout_task(struct net_device *dev);
static void e1000_smartspeed(struct e1000_adapter *adapter);
@@ -2077,7 +2077,7 @@ e1000_update_stats(struct e1000_adapter
* @adapter: board private structure
**/
-static inline void
+static void
e1000_irq_disable(struct e1000_adapter *adapter)
{
atomic_inc(&adapter->irq_sem);
@@ -2593,7 +2593,7 @@ e1000_mii_ioctl(struct net_device *netde
* @sk_buff: socket buffer with received data
**/
-static inline void
+static void
e1000_rx_checksum(struct e1000_adapter *adapter,
struct e1000_rx_desc *rx_desc,
struct sk_buff *skb)
_