Add iwmc3200wifi driver.

It only supports kernel >= 2.6.29, because it uses new netdev_ops api.
If you need support for older kernel please backport it.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>

diff --git a/compat/compat.diff b/compat/compat.diff
index 846e8f5adad68e38f1505c7b95568e4bacd32813..dec8e91c2cb7899989adff532fec79c79344a2ea 100644 (file)
--- a/compat/compat.diff
+++ b/compat/compat.diff
@@ -181,12 +181,6 @@
  obj-$(CONFIG_LIBERTAS)                += libertas/
  
  obj-$(CONFIG_LIBERTAS_THINFIRM)       += libertas_tf/
-@@ -60,5 +34,3 @@
- obj-$(CONFIG_MAC80211_HWSIM)  += mac80211_hwsim.o
- 
- obj-$(CONFIG_WL12XX)  += wl12xx/
--
--obj-$(CONFIG_IWM)     += iwmc3200wifi/
 --- a/drivers/net/wireless/b43/pcmcia.c
 +++ b/drivers/net/wireless/b43/pcmcia.c
 @@ -87,7 +87,11 @@ static int __devinit b43_pcmcia_probe(struct pcmcia_device *dev)

diff --git a/config.mk b/config.mk
index 0a2cbb33c06b8693b7167cefbf5095d8db7a50f5..7de159b5c7addd033fadf389ae1a66fab7dd1de7 100644 (file)
--- a/config.mk
+++ b/config.mk
@@ -305,6 +305,13 @@ ifneq ($(CONFIG_MMC),)
 CONFIG_LIBERTAS_SDIO=m
 NEED_LIBERTAS=y
 
+# Activate iwmc3200wifi support only on kernel >= 2.6.29.
+# iwmc3200wifi uses new netdev_ops api no supported by old kernel.
+ifeq ($(shell test $(KERNEL_SUBLEVEL) -ge 29 && echo yes),yes)
+CONFIG_IWM=m
+# CONFIG_IWM_DEBUG=y
+endif
+
 endif # end of SDIO driver list
 
 # Common rt2x00 requirements

diff --git a/scripts/admin-update.sh b/scripts/admin-update.sh
index ae42894bb7c0f23c60241cf689b2dacd26b9c54b..07f7d852a3f5e439e0a8c0d8c5bf8b3c7811c8e6 100755 (executable)
--- a/scripts/admin-update.sh
+++ b/scripts/admin-update.sh
@@ -64,6 +64,7 @@ DRIVERS="$DRIVERS drivers/net/wireless/rtl818x"
 DRIVERS="$DRIVERS drivers/net/wireless/libertas_tf"
 DRIVERS="$DRIVERS drivers/net/wireless/ipw2x00"
 DRIVERS="$DRIVERS drivers/net/wireless/wl12xx"
+DRIVERS="$DRIVERS drivers/net/wireless/iwmc3200wifi"
 
 # Drivers that belong the the wireless directory
 DRIVER_FILES="adm8211.c  adm8211.h"