i2400m: Makefile and Kconfig

Integrate the i2400m driver into the kernel's build and Kconfig.

Signed-off-by: Inaky Perez-Gonzalez <inaky@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 9a18270c108172c29657063057ed0cc5e5e9258d..97ea7c60e0021ead3ddbc50cd56310a31e36d80e 100644 (file)
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -2614,6 +2614,8 @@ source "drivers/net/tokenring/Kconfig"
 
 source "drivers/net/wireless/Kconfig"
 
+source "drivers/net/wimax/Kconfig"
+
 source "drivers/net/usb/Kconfig"
 
 source "drivers/net/pcmcia/Kconfig"

diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index e5c34b4642111b22cc692362aac3c8ae881ab84d..a3c5c002f224343ad30343b0ffc485b358075c77 100644 (file)
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -263,3 +263,4 @@ obj-$(CONFIG_NIU) += niu.o
 obj-$(CONFIG_VIRTIO_NET) += virtio_net.o
 obj-$(CONFIG_SFC) += sfc/
 
+obj-$(CONFIG_WIMAX) += wimax/

diff --git a/drivers/net/wimax/Kconfig b/drivers/net/wimax/Kconfig
new file mode 100644 (file)
index 0000000..565018e
--- /dev/null
+++ b/drivers/net/wimax/Kconfig
@@ -0,0 +1,17 @@
+#
+# WiMAX LAN device drivers configuration
+#
+
+
+comment "Enable WiMAX (Networking options) to see the WiMAX drivers"
+       depends on WIMAX = n
+
+if WIMAX
+
+menu "WiMAX Wireless Broadband devices"
+
+source "drivers/net/wimax/i2400m/Kconfig"
+
+endmenu
+
+endif

diff --git a/drivers/net/wimax/Makefile b/drivers/net/wimax/Makefile
new file mode 100644 (file)
index 0000000..992bc02
--- /dev/null
+++ b/drivers/net/wimax/Makefile
@@ -0,0 +1,5 @@
+
+obj-$(CONFIG_WIMAX_I2400M)     += i2400m/
+
+# (from Sam Ravnborg) force kbuild to create built-in.o
+obj- := dummy.o

diff --git a/drivers/net/wimax/i2400m/Kconfig b/drivers/net/wimax/i2400m/Kconfig
new file mode 100644 (file)
index 0000000..d623b3d
--- /dev/null
+++ b/drivers/net/wimax/i2400m/Kconfig
@@ -0,0 +1,49 @@
+
+config WIMAX_I2400M
+       tristate
+       depends on WIMAX
+       select FW_LOADER
+
+comment "Enable USB support to see WiMAX USB drivers"
+       depends on USB = n
+
+comment "Enable MMC support to see WiMAX SDIO drivers"
+       depends on MMC = n
+
+config WIMAX_I2400M_USB
+       tristate "Intel Wireless WiMAX Connection 2400 over USB (including 5x50)"
+       depends on WIMAX && USB
+       select WIMAX_I2400M
+       help
+         Select if you have a device based on the Intel WiMAX
+         Connection 2400 over USB (like any of the Intel Wireless
+         WiMAX/WiFi Link 5x50 series).
+
+         If unsure, it is safe to select M (module).
+
+config WIMAX_I2400M_SDIO
+       tristate "Intel Wireless WiMAX Connection 2400 over SDIO"
+       depends on WIMAX && MMC
+       select WIMAX_I2400M
+       help
+         Select if you have a device based on the Intel WiMAX
+         Connection 2400 over SDIO.
+
+         If unsure, it is safe to select M (module).
+
+config WIMAX_I2400M_DEBUG_LEVEL
+       int "WiMAX i2400m debug level"
+       depends on WIMAX_I2400M
+       default 8
+       help
+
+         Select the maximum debug verbosity level to be compiled into
+         the WiMAX i2400m driver code.
+
+         By default, this is disabled at runtime and can be
+         selectively enabled at runtime 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/drivers/net/wimax/i2400m/Makefile b/drivers/net/wimax/i2400m/Makefile
new file mode 100644 (file)
index 0000000..1696e93
--- /dev/null
+++ b/drivers/net/wimax/i2400m/Makefile
@@ -0,0 +1,29 @@
+
+obj-$(CONFIG_WIMAX_I2400M) += i2400m.o
+obj-$(CONFIG_WIMAX_I2400M_USB) += i2400m-usb.o
+obj-$(CONFIG_WIMAX_I2400M_SDIO) += i2400m-sdio.o
+
+i2400m-y :=            \
+       control.o       \
+       driver.o        \
+       fw.o            \
+       op-rfkill.o     \
+       netdev.o        \
+       tx.o            \
+       rx.o
+
+i2400m-$(CONFIG_DEBUG_FS) += debugfs.o
+
+i2400m-usb-y :=                        \
+       usb-fw.o                \
+       usb-notif.o             \
+       usb-tx.o                \
+       usb-rx.o                \
+       usb.o
+
+
+i2400m-sdio-y :=               \
+       sdio.o                  \
+       sdio-tx.o               \
+       sdio-fw.o               \
+       sdio-rx.o