aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-04-27 16:20:37 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-04-27 16:20:37 -0700
commit42fae7fb1c27d230fbd48aa055a4ae6796fb0039 (patch)
tree94836c3535cf7e972cdc2ea65598fa2182b20fa3 /include
parentf00546363fff1576ceddc2690d47e5f9c1dd2e05 (diff)
parentb8b8fd2dc23725fba77f66b3fef11b11f983fc08 (diff)
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: [NET]: Fix networking compilation errors [AF_RXRPC/AFS]: Arch-specific fixes. [AFS]: Fix VLocation record update wakeup [NET]: Revert sk_buff walker cleanups.
Diffstat (limited to 'include')
-rw-r--r--include/net/wext.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/wext.h b/include/net/wext.h
index 55741836a67..c02b8decf3a 100644
--- a/include/net/wext.h
+++ b/include/net/wext.h
@@ -10,7 +10,7 @@ extern int wext_proc_init(void);
extern int wext_handle_ioctl(struct ifreq *ifr, unsigned int cmd,
void __user *arg);
#else
-static inline int wext_proc_init()
+static inline int wext_proc_init(void)
{
return 0;
}