399d5cf532
Some of our local patches have been accepted upstream. And there are some more relevant changes (mostly for rt2800usb). Import them and rebase our remaining local patches on top. Signed-off-by: Daniel Golle <daniel@makrotopia.org>
47 lines
903 B
Diff
47 lines
903 B
Diff
--- a/drivers/net/wireless/ralink/rt2x00/Kconfig
|
|
+++ b/drivers/net/wireless/ralink/rt2x00/Kconfig
|
|
@@ -225,36 +225,37 @@ config RT2800SOC
|
|
|
|
|
|
config RT2800_LIB
|
|
- tristate
|
|
+ tristate "RT2800 USB/PCI support"
|
|
depends on m
|
|
|
|
config RT2800_LIB_MMIO
|
|
- tristate
|
|
+ tristate "RT2800 MMIO support"
|
|
depends on m
|
|
select RT2X00_LIB_MMIO
|
|
select RT2800_LIB
|
|
|
|
config RT2X00_LIB_MMIO
|
|
- tristate
|
|
+ tristate "RT2x00 MMIO support"
|
|
depends on m
|
|
|
|
config RT2X00_LIB_PCI
|
|
- tristate
|
|
+ tristate "RT2x00 PCI support"
|
|
depends on m
|
|
select RT2X00_LIB
|
|
|
|
config RT2X00_LIB_SOC
|
|
- tristate
|
|
+ tristate "RT2x00 SoC support"
|
|
+ depends on SOC_RT288X || SOC_RT305X || SOC_MT7620
|
|
depends on m
|
|
select RT2X00_LIB
|
|
|
|
config RT2X00_LIB_USB
|
|
- tristate
|
|
+ tristate "RT2x00 USB support"
|
|
depends on m
|
|
select RT2X00_LIB
|
|
|
|
config RT2X00_LIB
|
|
- tristate
|
|
+ tristate "RT2x00 support"
|
|
depends on m
|
|
|
|
config RT2X00_LIB_FIRMWARE
|