aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuido Guenther <agx@sigxcpu.org>2007-02-22 18:24:55 +0100
committerGuido Guenther <agx@bogon.sigxcpu.org>2007-02-22 18:24:55 +0100
commit7ff8a12bf13a82d3427555bebfb0fd8a94f751ed (patch)
tree7c8afb9a6ac479d95183b65995801a025d5befcb
parent72ebbfc099003d1bb200abbf36e2a616435da75a (diff)
rediff against 2.6.20 finalsubmit_upstream_second_try
-rw-r--r--kernel_patch.diff21
1 files changed, 19 insertions, 2 deletions
diff --git a/kernel_patch.diff b/kernel_patch.diff
index f16c78e..7775259 100644
--- a/kernel_patch.diff
+++ b/kernel_patch.diff
@@ -1,3 +1,20 @@
+diff --git a/MAINTAINERS b/MAINTAINERS
+index 0ad8803..70dcecd 100644
+--- a/MAINTAINERS
++++ b/MAINTAINERS
+@@ -609,6 +609,12 @@ W: http://www.thekelleys.org.uk/atmel
+ W: http://atmelwlandriver.sourceforge.net/
+ S: Maintained
+
++ATMEL USB WIRELESS DRIVER
++M: at76c503a-develop@lists.berlios.de
++L: at76c503a-user@lists.berlios.de
++W: http://at76c503a.berlios.de/
++S: Maintained
++
+ AUDIT SUBSYSTEM
+ P: David Woodhouse
+ M: dwmw2@infradead.org
diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig
index ece3d9c..af482a2 100644
--- a/drivers/net/wireless/Kconfig
@@ -18,7 +35,7 @@ index ece3d9c..af482a2 100644
comment "Wireless 802.11b Pcmcia/Cardbus cards support"
depends on NET_RADIO && PCMCIA
diff --git a/drivers/net/wireless/Makefile b/drivers/net/wireless/Makefile
-index c613af1..68732e3 100644
+index c613af1..3ba079a 100644
--- a/drivers/net/wireless/Makefile
+++ b/drivers/net/wireless/Makefile
@@ -31,6 +31,9 @@ obj-$(CONFIG_AIRO_CS) += airo_cs.o airo.o
@@ -27,7 +44,7 @@ index c613af1..68732e3 100644
obj-$(CONFIG_PCMCIA_ATMEL) += atmel_cs.o
+obj-$(CONFIG_USB_ATMEL) += at76_usb.o
+
-+at76_usb-objs := at76c503.o $(at76_usb-obj-y)
++at76_usb-objs := at76c503.o
obj-$(CONFIG_PRISM54) += prism54/