From bfccf65d85ad6ac37ff3e90fd1e1f828b43eda46 Mon Sep 17 00:00:00 2001
From: Ben Hutchings <bhutchings@solarflare.com>
Date: Fri, 16 May 2008 21:19:05 +0100
Subject: [PATCH] --- yaml --- r: 97334 b: refs/heads/master c:
 6f8135ca7224d98c2de43edde69f4e6bec12da0e h: refs/heads/master v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/net/sfc/net_driver.h | 5 -----
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 077650d55148..a20ad1acde12 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9bbd7d9a3528de1b5b915fa77df027b4de62174c
+refs/heads/master: 6f8135ca7224d98c2de43edde69f4e6bec12da0e
diff --git a/trunk/drivers/net/sfc/net_driver.h b/trunk/drivers/net/sfc/net_driver.h
index 77418aed9a39..be09180ca39d 100644
--- a/trunk/drivers/net/sfc/net_driver.h
+++ b/trunk/drivers/net/sfc/net_driver.h
@@ -81,11 +81,6 @@ do {if (net_ratelimit()) EFX_INFO(efx, fmt, ##args); } while (0)
 #define EFX_LOG_RL(efx, fmt, args...) \
 do {if (net_ratelimit()) EFX_LOG(efx, fmt, ##args); } while (0)
 
-/* Kernel headers may redefine inline anyway */
-#ifndef inline
-#define inline inline __attribute__ ((always_inline))
-#endif
-
 /**************************************************************************
  *
  * Efx data structures