diff --git a/[refs] b/[refs]
index 921f7635fef5..3f7c99c9905c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 071d93931a75dc1f82f0baa9959613af81c5a032
+refs/heads/master: 397ff16dce53888ec693b3718640be2560204751
diff --git a/trunk/net/atm/pppoatm.c b/trunk/net/atm/pppoatm.c
index aeb726cffc8c..3dce84af5dbe 100644
--- a/trunk/net/atm/pppoatm.c
+++ b/trunk/net/atm/pppoatm.c
@@ -214,7 +214,7 @@ static void pppoatm_push(struct atm_vcc *atmvcc, struct sk_buff *skb)
 	ppp_input_error(&pvcc->chan, 0);
 }
 
-static inline int pppoatm_may_send(struct pppoatm_vcc *pvcc, int size)
+static int pppoatm_may_send(struct pppoatm_vcc *pvcc, int size)
 {
 	/*
 	 * It's not clear that we need to bother with using atm_may_send()