aboutsummaryrefslogtreecommitdiffstats
diff options
authorGreg Kroah-Hartman <gregkh@suse.de>2009-01-04 20:33:41 -0800
committerGreg Kroah-Hartman <gregkh@suse.de>2009-01-04 20:33:41 -0800
commit770550fdcd172423129f92dd54f600882c65d644 (patch)
tree5d96a3719b21969d24bb7163831ae093521e09f3
parent01f7d91d01716b93c7a4a97312161c99ba57820f (diff)
downloadpatches-770550fdcd172423129f92dd54f600882c65d644.tar.gz
wimax fixes from Inaky
Diffstat
-rw-r--r--usb/i2400m-makefile-and-kconfig.patch69
-rw-r--r--usb/wimax-makefile-kconfig-and-docbook-linkage-for-the-stack.patch62
2 files changed, 68 insertions, 63 deletions
diff --git a/usb/i2400m-makefile-and-kconfig.patch b/usb/i2400m-makefile-and-kconfig.patch
index 82bc19f9cb00f1..81866c35daa001 100644
--- a/usb/i2400m-makefile-and-kconfig.patch
+++ b/usb/i2400m-makefile-and-kconfig.patch
@@ -1,10 +1,10 @@
-From inaky@linux.intel.com Sat Dec 20 21:10:00 2008
+From 4d704321da4020a0c11396ca6785be2d948fe728 Mon Sep 17 00:00:00 2001
+Message-Id: <4d704321da4020a0c11396ca6785be2d948fe728.1230078072.git.inaky@linux.intel.com>
+In-Reply-To: <cover.1230078071.git.inaky@linux.intel.com>
+References: <cover.1230078071.git.inaky@linux.intel.com>
From: Inaky Perez-Gonzalez <inaky@linux.intel.com>
-Date: Sat, 20 Dec 2008 16:57:58 -0800
+Date: Tue, 23 Dec 2008 16:18:48 -0800
Subject: i2400m: Makefile and Kconfig
-To: netdev@vger.kernel.org
-Cc: wimax@linuxwimax.org, greg@kroah.com
-Message-ID: <dc5cb8f91926f452133078c8bc8cad30ab263a22.1229820957.git.inaky@linux.intel.com>
From: Inaky Perez-Gonzalez <inaky@linux.intel.com>
@@ -17,10 +17,10 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/net/Kconfig | 2 +
drivers/net/Makefile | 1
drivers/net/wimax/Kconfig | 17 +++++++++++++
- drivers/net/wimax/Makefile | 2 +
+ drivers/net/wimax/Makefile | 5 +++
drivers/net/wimax/i2400m/Kconfig | 49 ++++++++++++++++++++++++++++++++++++++
drivers/net/wimax/i2400m/Makefile | 29 ++++++++++++++++++++++
- 6 files changed, 100 insertions(+)
+ 6 files changed, 103 insertions(+)
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -39,59 +39,59 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
obj-$(CONFIG_VIRTIO_NET) += virtio_net.o
obj-$(CONFIG_SFC) += sfc/
-+obj-y += wimax/
++obj-$(CONFIG_WIMAX) += wimax/
--- /dev/null
+++ b/drivers/net/wimax/i2400m/Kconfig
@@ -0,0 +1,49 @@
+
+config WIMAX_I2400M
-+ tristate
++ tristate
+ depends on WIMAX
-+ select FW_LOADER
++ select FW_LOADER
+
+comment "Enable USB support to see WiMAX USB drivers"
-+ depends on USB = n
++ depends on USB = n
+
+comment "Enable MMC support to see WiMAX SDIO drivers"
-+ depends on MMC = n
++ 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
++ 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).
++ 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
++ select WIMAX_I2400M
+ help
+ Select if you have a device based on the Intel WiMAX
-+ Connection 2400 over SDIO.
++ Connection 2400 over SDIO.
+
-+ If unsure, it is safe to select M (module).
++ 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
++ 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.
++ 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.
++ 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.
++ If set at zero, this will compile out all the debug code.
+
-+ It is recommended that it is left at 8.
++ It is recommended that it is left at 8.
--- /dev/null
+++ b/drivers/net/wimax/i2400m/Makefile
@@ -0,0 +1,29 @@
@@ -100,7 +100,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+obj-$(CONFIG_WIMAX_I2400M_USB) += i2400m-usb.o
+obj-$(CONFIG_WIMAX_I2400M_SDIO) += i2400m-sdio.o
+
-+i2400m-objs := \
++i2400m-y := \
+ control.o \
+ driver.o \
+ fw.o \
@@ -111,7 +111,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+i2400m-$(CONFIG_DEBUG_FS) += debugfs.o
+
-+i2400m-usb-objs := \
++i2400m-usb-y := \
+ usb-fw.o \
+ usb-notif.o \
+ usb-tx.o \
@@ -119,7 +119,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+ usb.o
+
+
-+i2400m-sdio-objs := \
++i2400m-sdio-y := \
+ sdio.o \
+ sdio-tx.o \
+ sdio-fw.o \
@@ -133,7 +133,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+
+comment "Enable WiMAX (Networking options) to see the WiMAX drivers"
-+ depends on WIMAX = n
++ depends on WIMAX = n
+
+if WIMAX
+
@@ -146,6 +146,9 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+endif
--- /dev/null
+++ b/drivers/net/wimax/Makefile
-@@ -0,0 +1,2 @@
+@@ -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/usb/wimax-makefile-kconfig-and-docbook-linkage-for-the-stack.patch b/usb/wimax-makefile-kconfig-and-docbook-linkage-for-the-stack.patch
index 33b52232ef4532..bcbc6f164270c1 100644
--- a/usb/wimax-makefile-kconfig-and-docbook-linkage-for-the-stack.patch
+++ b/usb/wimax-makefile-kconfig-and-docbook-linkage-for-the-stack.patch
@@ -1,10 +1,10 @@
-From inaky@linux.intel.com Sat Dec 20 20:31:51 2008
+From 52ee3acf71f4f8079482f803ce3e510d05214145 Mon Sep 17 00:00:00 2001
+Message-Id: <52ee3acf71f4f8079482f803ce3e510d05214145.1230078072.git.inaky@linux.intel.com>
+In-Reply-To: <cover.1230078071.git.inaky@linux.intel.com>
+References: <cover.1230078071.git.inaky@linux.intel.com>
From: Inaky Perez-Gonzalez <inaky@linux.intel.com>
-Date: Sat, 20 Dec 2008 16:57:41 -0800
+Date: Tue, 23 Dec 2008 16:18:24 -0800
Subject: wimax: Makefile, Kconfig and docbook linkage for the stack
-To: netdev@vger.kernel.org
-Cc: wimax@linuxwimax.org, greg@kroah.com
-Message-ID: <a8a7a4da5832ca49e580676dd3a9e1baf7b9869c.1229820957.git.inaky@linux.intel.com>
From: Inaky Perez-Gonzalez <inaky@linux.intel.com>
@@ -19,9 +19,9 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Documentation/DocBook/networking.tmpl | 8 +++++++
net/Kconfig | 2 +
net/Makefile | 1
- net/wimax/Kconfig | 36 ++++++++++++++++++++++++++++++++++
- net/wimax/Makefile | 13 ++++++++++++
- 5 files changed, 60 insertions(+)
+ net/wimax/Kconfig | 38 ++++++++++++++++++++++++++++++++++
+ net/wimax/Makefile | 13 +++++++++++
+ 5 files changed, 62 insertions(+)
--- a/Documentation/DocBook/networking.tmpl
+++ b/Documentation/DocBook/networking.tmpl
@@ -60,50 +60,52 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+obj-$(CONFIG_WIMAX) += wimax/
--- /dev/null
+++ b/net/wimax/Kconfig
-@@ -0,0 +1,36 @@
+@@ -0,0 +1,38 @@
+#
+# WiMAX LAN device configuration
+#
+
+menuconfig WIMAX
-+ tristate "WiMAX Wireless Broadband support"
-+ help
++ tristate "WiMAX Wireless Broadband support"
++ help
+
-+ Select to configure support for devices that provide wireless
-+ broadband connectivity using the WiMAX protocol (IEEE 802.16).
++ 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.
++ 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
++ The different WiMAX drivers can be enabled in the menu entry
+
-+ Device Drivers > Network device support > WiMAX Wireless Broadband devices
++ Device Drivers > Network device support > WiMAX Wireless
++ Broadband devices
+
-+ If unsure, it is safe to select M (module).
++ If unsure, it is safe to select M (module).
+
+config WIMAX_DEBUG_LEVEL
-+ int "WiMAX debug level"
-+ depends on WIMAX
-+ default 8
-+ help
++ int "WiMAX debug level"
++ depends on WIMAX
++ default 8
++ help
+
-+ Select the maximum debug verbosity level to be compiled into
-+ the WiMAX stack code.
++ 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.
++ 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.
++ If set at zero, this will compile out all the debug code.
+
-+ It is recommended that it is left at 8.
++ It is recommended that it is left at 8.
--- /dev/null
+++ b/net/wimax/Makefile
@@ -0,0 +1,13 @@
+
+obj-$(CONFIG_WIMAX) += wimax.o
+
-+wimax-objs := \
++wimax-y := \
+ id-table.o \
+ op-msg.o \
+ op-reset.o \
generated by cgit 1.2.3-korg (git 2.43.0) at 2026-03-01 18:04:24 +0000