diff options
| author | Guido Guenther <agx@sigxcpu.org> | 2007-01-10 13:54:19 +0100 |
|---|---|---|
| committer | Guido Guenther <agx@bogon.sigxcpu.org> | 2007-01-10 13:54:19 +0100 |
| commit | a9435e9f226c472b0dc35425a6fec41191752053 (patch) | |
| tree | 17bee1a8b060fe5b98a35ff9c6cd15c70404c27c | |
| parent | b32e135ba4476e748d27939869f9f2b4afefdc53 (diff) | |
adjust to current source layout and kernel 2.6.20-rc3
| -rw-r--r-- | kernel_patch.diff | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/kernel_patch.diff b/kernel_patch.diff index 8395028..f16c78e 100644 --- a/kernel_patch.diff +++ b/kernel_patch.diff @@ -1,7 +1,8 @@ diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig +index ece3d9c..af482a2 100644 --- a/drivers/net/wireless/Kconfig +++ b/drivers/net/wireless/Kconfig -@@ -405,6 +405,14 @@ config PCI_ATMEL +@@ -394,6 +394,14 @@ config PCI_ATMEL Enable support for PCI and mini-PCI cards containing the Atmel at76c506 chip. @@ -17,15 +18,16 @@ diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig 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 --- a/drivers/net/wireless/Makefile +++ b/drivers/net/wireless/Makefile -@@ -31,6 +31,9 @@ obj-$(CONFIG_AIRO_CS) += airo_cs.o airo +@@ -31,6 +31,9 @@ obj-$(CONFIG_AIRO_CS) += airo_cs.o airo.o 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 + -+at76_usb-objs := at76c503.o at76_usbdfu.o ++at76_usb-objs := at76c503.o $(at76_usb-obj-y) obj-$(CONFIG_PRISM54) += prism54/ - obj-$(CONFIG_PRISM54_USB) += prism54usb/ + |