diff options
| author | Pavel Roskin <proski@gnu.org> | 2007-07-12 04:16:48 -0400 |
|---|---|---|
| committer | Guido Guenther <agx@bogon.sigxcpu.org> | 2007-07-15 12:19:08 -0400 |
| commit | 31ca6a9450c84fd6673133e75681f89edb778f7c (patch) | |
| tree | f1e743fb1ab9f042508ae7b60cb3f6c62f30c1f6 | |
| parent | 25e0528321d620ba35565f33a3938e53a14b5338 (diff) | |
[PATCH] Update kernel patch for current wireless-dev.git
Signed-off-by: Pavel Roskin <proski@gnu.org>
| -rw-r--r-- | kernel_patch.diff | 32 |
1 files changed, 18 insertions, 14 deletions
diff --git a/kernel_patch.diff b/kernel_patch.diff index 0ec6f2f..b09aa89 100644 --- a/kernel_patch.diff +++ b/kernel_patch.diff @@ -1,14 +1,17 @@ diff --git a/MAINTAINERS b/MAINTAINERS -index 0ad8803..70dcecd 100644 +index 86415f7..e90e60d 100644 --- a/MAINTAINERS +++ b/MAINTAINERS -@@ -609,6 +609,12 @@ W: http://www.thekelleys.org.uk/atmel +@@ -690,6 +690,15 @@ W: http://www.thekelleys.org.uk/atmel W: http://atmelwlandriver.sourceforge.net/ S: Maintained +ATMEL USB WIRELESS DRIVER -+M: at76c503a-develop@lists.berlios.de ++P: Pavel Roskin ++M: proski@gnu.org ++L: linux-wireless@vger.kernel.org +L: at76c503a-user@lists.berlios.de ++L: at76c503a-develop@lists.berlios.de +W: http://at76c503a.berlios.de/ +S: Maintained + @@ -16,33 +19,34 @@ index 0ad8803..70dcecd 100644 P: David Woodhouse M: dwmw2@infradead.org diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig -index ece3d9c..af482a2 100644 +index 7c4d202..f32979b 100644 --- a/drivers/net/wireless/Kconfig +++ b/drivers/net/wireless/Kconfig -@@ -394,6 +394,14 @@ config PCI_ATMEL +@@ -403,6 +403,14 @@ config PCI_ATMEL Enable support for PCI and mini-PCI cards containing the Atmel at76c506 chip. +config USB_ATMEL + tristate "Atmel at76c503/at76c505/at76c505a USB cards" -+ depends on NET_RADIO && USB ++ depends on WLAN_80211 && USB + select FW_LOADER + ---help--- + Enable support for USB Wireless devices using Atmel at76c503, -+ at76c505 or at76c505a chip. ++ at76c505 or at76c505a chips. + - # If Pcmcia is compiled in, offer Pcmcia cards... - comment "Wireless 802.11b Pcmcia/Cardbus cards support" - depends on NET_RADIO && PCMCIA + config PCMCIA_HERMES + tristate "Hermes PCMCIA card support" + depends on PCMCIA && HERMES diff --git a/drivers/net/wireless/Makefile b/drivers/net/wireless/Makefile -index c613af1..d8d32ea 100644 +index b0f28ca..397c7f0 100644 --- a/drivers/net/wireless/Makefile +++ b/drivers/net/wireless/Makefile -@@ -31,6 +31,7 @@ obj-$(CONFIG_AIRO_CS) += airo_cs.o airo.o - obj-$(CONFIG_ATMEL) += atmel.o +@@ -32,6 +32,8 @@ obj-$(CONFIG_ATMEL) += atmel.o obj-$(CONFIG_PCI_ATMEL) += atmel_pci.o obj-$(CONFIG_PCMCIA_ATMEL) += atmel_cs.o -+obj-$(CONFIG_USB_ATMEL) += at76_usb.o ++obj-$(CONFIG_USB_ATMEL) += at76_usb.o ++ obj-$(CONFIG_PRISM54) += prism54/ + obj-$(CONFIG_HOSTAP) += hostap/ |