Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6

[linux-2.6] / include / net / wext.h

diff --git a/include/net/wext.h b/include/net/wext.h
index 55741836a675db5b59dac0c0a0a1740e4baec4b9..c02b8decf3af8324b104bfeb5f9593785ec2f321 100644 (file)
--- 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;
 }