Change + add Kconfig & Makefile files to fit the rt2x00 driver into the kernel.
Signed-off-by: Ivo van Doorn <[EMAIL PROTECTED]>
diff -U 3 -H -w -E -d -r -N -- wireless-2.6/drivers/net/wireless/Kconfig
wireless-2.6-rt2x00/drivers/net/wireless/Kconfig
--- wireless-2.6/drivers/net/wireless/Kconfig 2006-01-29 22:58:11.000000000
+0100
+++ wireless-2.6-rt2x00/drivers/net/wireless/Kconfig 2006-01-29
23:05:32.000000000 +0100
@@ -481,6 +481,8 @@
This is an experimental driver for the Broadcom 43xx wireless chip,
found in the Apple Airport Extreme and various other devices.
+source "drivers/net/wireless/rt2x00/Kconfig"
+
# yes, this works even when no drivers are selected
config NET_WIRELESS
bool
diff -U 3 -H -w -E -d -r -N -- wireless-2.6/drivers/net/wireless/Makefile
wireless-2.6-rt2x00/drivers/net/wireless/Makefile
--- wireless-2.6/drivers/net/wireless/Makefile 2006-01-29 22:58:11.000000000
+0100
+++ wireless-2.6-rt2x00/drivers/net/wireless/Makefile 2006-01-29
23:05:51.000000000 +0100
@@ -36,6 +36,7 @@
obj-$(CONFIG_HOSTAP) += hostap/
obj-$(CONFIG_BCM43XX_D80211) += bcm43xx-d80211/
+obj-$(CONFIG_RT2X00) += rt2x00/
# 16-bit wireless PCMCIA client drivers
obj-$(CONFIG_PCMCIA_RAYCS) += ray_cs.o
diff -U 3 -H -w -E -d -r -N -- wireless-2.6/drivers/net/wireless/rt2x00/Kconfig
wireless-2.6-rt2x00/drivers/net/wireless/rt2x00/Kconfig
--- wireless-2.6/drivers/net/wireless/rt2x00/Kconfig 1970-01-01
01:00:00.000000000 +0100
+++ wireless-2.6-rt2x00/drivers/net/wireless/rt2x00/Kconfig 2006-01-29
15:38:13.000000000 +0100
@@ -0,0 +1,68 @@
+config RT2X00
+ bool "Ralink driver support"
+ depends on NET_RADIO && D80211 && EXPERIMENTAL
+ ---help---
+ This will enable the experimental support for the Ralink drivers,
+ developed in the rt2x00 project <http://rt2x00.serialmonkey.com>.
+
+ These drivers will make use of the DeviceScape ieee80211 stack.
+
+config RT2400PCI
+ tristate "Ralink rt2400 pci/pcmcia support"
+ depends on RT2X00 && PCI
+ ---help---
+ This is an experimental driver for the Ralink rt2400 wireless chip.
+
+ When compiled as a module, this driver will be called "rt2400pci.ko".
+
+config RT2400PCI_BUTTON
+ bool "Ralink rt2400 hardware button support"
+ depends on RT2400PCI && X86
+ ---help---
+ In some notebooks the rt2400 chipset is integrated in the machine,
+ with this option enabled the device will periodically poll the
+ the status of this button and will send and ACPI event when
+ the button has been pressed.
+
+config RT2400PCI_DEBUG
+ bool "Ralink rt2400 debug output"
+ depends on RT2400PCI
+ ---help---
+ Enable debugging output.
+
+config RT2500PCI
+ tristate "Ralink rt2500 pci/pcmcia support"
+ depends on RT2X00 && PCI
+ ---help---
+ This is an experimental driver for the Ralink rt2500 wireless chip.
+
+ When compiled as a module, this driver will be called "rt2500pci.ko".
+
+config RT2500PCI_BUTTON
+ bool "Ralink rt2500 hardware button support"
+ depends on RT2500PCI && X86
+ ---help---
+ In some notebooks the rt2500 chipset is integrated in the machine,
+ with this option enabled the device will periodically poll the
+ the status of this button and will send and ACPI event when
+ the button has been pressed.
+
+config RT2500PCI_DEBUG
+ bool "Ralink rt2500 debug output"
+ depends on RT2500PCI
+ ---help---
+ Enable debugging output.
+
+config RT2500USB
+ tristate "Ralink rt2500 usb support"
+ depends on RT2X00 && USB
+ ---help---
+ This is an experimental driver for the Ralink rt2500 wireless chip.
+
+ When compiled as a module, this driver will be called "rt2500usb.ko".
+
+config RT2500USB_DEBUG
+ bool "Ralink rt2500 debug output"
+ depends on RT2500USB
+ ---help---
+ Enable debugging output.
diff -U 3 -H -w -E -d -r -N --
wireless-2.6/drivers/net/wireless/rt2x00/Makefile
wireless-2.6-rt2x00/drivers/net/wireless/rt2x00/Makefile
--- wireless-2.6/drivers/net/wireless/rt2x00/Makefile 1970-01-01
01:00:00.000000000 +0100
+++ wireless-2.6-rt2x00/drivers/net/wireless/rt2x00/Makefile 2006-01-29
15:13:01.000000000 +0100
@@ -0,0 +1,3 @@
+obj-$(CONFIG_RT2400PCI) += rt2400pci.o
+obj-$(CONFIG_RT2500PCI) += rt2500pci.o
+obj-$(CONFIG_RT2500USB) += rt2500usb.o
pgpBcRzmk6cTN.pgp
Description: PGP signature
