From: Ben Hutchings <bhutchings@solarflare.com>
Date: Fri, 16 May 2008 20:19:05 +0000 (+0100)
Subject: sfc: Do not define inline macro
X-Git-Tag: v2.6.26-rc4~7^2~1^2~39
X-Git-Url: http://ftp.safe.ca/?a=commitdiff_plain;h=6f8135ca7224d98c2de43edde69f4e6bec12da0e;p=safe%2Fjmp%2Flinux-2.6

sfc: Do not define inline macro

Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
---

diff --git a/drivers/net/sfc/net_driver.h b/drivers/net/sfc/net_driver.h
index 77418ae..be09180 100644
--- a/drivers/net/sfc/net_driver.h
+++ b/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