diff options
| author | David S. Miller <davem@davemloft.net> | 2010-05-02 21:43:40 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-05-02 22:02:06 -0700 |
| commit | 7ef527377b88ff05fb122a47619ea506c631c914 (patch) | |
| tree | 2c2e774527d5f591b975834f43e8c6fd12fb38f2 /include/net/sock.h | |
| parent | 47d29646a2c1c147d8a7598aeac2c87dd71ed638 (diff) | |
| parent | 1183f3838c588545592c042c0ce15015661ce7f2 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'include/net/sock.h')
| -rw-r--r-- | include/net/sock.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/sock.h b/include/net/sock.h index cc7f91ec972..328e03f47dd 100644 --- a/include/net/sock.h +++ b/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, ...) { } |