4 files changed, 54 insertions, 0 deletions

diff --git a/net/Kconfig b/net/Kconfig
index 6ec2cce7c167..bf2776018f71 100644
--- a/net/Kconfig
+++ b/net/Kconfig
@@ -254,6 +254,8 @@ source "net/mac80211/Kconfig"
 
 endif # WIRELESS
 
+source "net/wimax/Kconfig"
+
 source "net/rfkill/Kconfig"
 source "net/9p/Kconfig"
 
diff --git a/net/Makefile b/net/Makefile
index ba4460432b7c..0fcce89d7169 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -63,3 +63,4 @@ endif
 ifeq ($(CONFIG_NET),y)
 obj-$(CONFIG_SYSCTL)            += sysctl_net.o
 endif
+obj-$(CONFIG_WIMAX)             += wimax/
diff --git a/net/wimax/Kconfig b/net/wimax/Kconfig
new file mode 100644
index 000000000000..0bdbb6928205
--- /dev/null
+++ b/net/wimax/Kconfig
@@ -0,0 +1,38 @@
+#
+# WiMAX LAN device configuration
+#
+
+menuconfig WIMAX
+        tristate "WiMAX Wireless Broadband support"
+        help
+
+          Select to configure support for devices that provide
+          wireless broadband connectivity using the WiMAX protocol
+          (IEEE 802.16).
+
+          Please note that most of these devices require signing up
+          for a service plan with a provider.
+
+          The different WiMAX drivers can be enabled in the menu entry
+
+          Device Drivers > Network device support > WiMAX Wireless
+          Broadband devices
+
+          If unsure, it is safe to select M (module).
+
+config WIMAX_DEBUG_LEVEL
+        int "WiMAX debug level"
+        depends on WIMAX
+        default 8
+        help
+
+          Select the maximum debug verbosity level to be compiled into
+          the WiMAX stack code.
+
+          By default, debug messages are disabled at runtime and can
+          be selectively enabled for different parts of the code using
+          the sysfs debug-levels file.
+
+          If set at zero, this will compile out all the debug code.
+
+          It is recommended that it is left at 8.
diff --git a/net/wimax/Makefile b/net/wimax/Makefile
new file mode 100644
index 000000000000..5b80b941c2c9
--- /dev/null
+++ b/net/wimax/Makefile
@@ -0,0 +1,13 @@
+
+obj-$(CONFIG_WIMAX)             += wimax.o
+
+wimax-y :=              \
+        id-table.o      \
+        op-msg.o        \
+        op-reset.o      \
+        op-rfkill.o     \
+        stack.o
+
+wimax-$(CONFIG_DEBUG_FS) += debugfs.o
+
+