Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts:

	drivers/usb/input/Makefile
	drivers/usb/input/gtco.c

1 files changed, 24 insertions, 0 deletions

diff --git a/include/net/wext.h b/include/net/wext.h
new file mode 100644
index 000000000000..c02b8decf3af
--- /dev/null
+++ b/include/net/wext.h
@@ -0,0 +1,24 @@
+#ifndef __NET_WEXT_H
+#define __NET_WEXT_H
+
+/*
+ * wireless extensions interface to the core code
+ */
+
+#ifdef CONFIG_WIRELESS_EXT
+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(void)
+{
+        return 0;
+}
+static inline int wext_handle_ioctl(struct ifreq *ifr, unsigned int cmd,
+                                    void __user *arg)
+{
+        return -EINVAL;
+}
+#endif
+
+#endif /* __NET_WEXT_H */