From bceb17b4afc757a1a32520b52e008664f7e217fd Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@medozas.de>
Date: Sun, 2 May 2010 13:42:39 -0700
Subject: [PATCH] --- yaml --- r: 190608 b: refs/heads/master c:
 1183f3838c588545592c042c0ce15015661ce7f2 h: refs/heads/master v: v3

---
 [refs]                   | 2 +-
 trunk/include/net/sock.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 27b0781682ce..4adaafcde06d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6f1464bf65fcaa57a4b32dae93de4e8bbdfaf7c5
+refs/heads/master: 1183f3838c588545592c042c0ce15015661ce7f2
diff --git a/trunk/include/net/sock.h b/trunk/include/net/sock.h
index b4603cd54fcd..1ad6435f252e 100644
--- a/trunk/include/net/sock.h
+++ b/trunk/include/net/sock.h
@@ -74,7 +74,7 @@
 					printk(KERN_DEBUG msg); } while (0)
 #else
 /* Validate arguments and do nothing */
-static void inline int __attribute__ ((format (printf, 2, 3)))
+static inline void __attribute__ ((format (printf, 2, 3)))
 SOCK_DEBUG(struct sock *sk, const char *msg, ...)
 {
 }