Merge tag 'v3.8-rc4' into irq/core

Merge Linux 3.8-rc4 before pulling in new commits - we were on an old v3.7 base.

Signed-off-by: Ingo Molnar <mingo@kernel.org>

1 files changed, 0 insertions, 20 deletions

diff --git a/drivers/net/ethernet/ibm/ehea/ehea_phyp.h b/drivers/net/ethernet/ibm/ehea/ehea_phyp.h
index 8364815c32ff..99b6c2a38dbf 100644
--- a/drivers/net/ethernet/ibm/ehea/ehea_phyp.h
+++ b/drivers/net/ethernet/ibm/ehea/ehea_phyp.h
@@ -39,26 +39,6 @@
  * hcp_*  - structures, variables and functions releated to Hypervisor Calls
  */
 
-static inline u32 get_longbusy_msecs(int long_busy_ret_code)
-{
-        switch (long_busy_ret_code) {
-        case H_LONG_BUSY_ORDER_1_MSEC:
-                return 1;
-        case H_LONG_BUSY_ORDER_10_MSEC:
-                return 10;
-        case H_LONG_BUSY_ORDER_100_MSEC:
-                return 100;
-        case H_LONG_BUSY_ORDER_1_SEC:
-                return 1000;
-        case H_LONG_BUSY_ORDER_10_SEC:
-                return 10000;
-        case H_LONG_BUSY_ORDER_100_SEC:
-                return 100000;
-        default:
-                return 1;
-        }
-}
-
 /* Number of pages which can be registered at once by H_REGISTER_HEA_RPAGES */
 #define EHEA_MAX_RPAGE 512