introduce USB_SUPPORT, clean up some dependencies

[15.05/openwrt.git] / target / linux / Config.in

diff --git a/target/linux/Config.in b/target/linux/Config.in
index 7589ea7..1c1361e 100644 (file)
--- a/target/linux/Config.in
+++ b/target/linux/Config.in
@@ -16,13 +16,6 @@ config PACKAGE_KMOD_ATM
        help
          ATM support
 
-config PACKAGE_KMOD_GRE
-       prompt "kmod-gre.......................... GRE tunneling driver"
-       tristate
-       default m
-       help
-         Kernel support for GRE tunnels
-       
 config PACKAGE_KMOD_IPIP
        prompt "kmod-ipip......................... IP in IP encapsulation support"
        tristate
@@ -30,13 +23,6 @@ config PACKAGE_KMOD_IPIP
        help
          Kernel module for IP in IP encapsulation
 
-config PACKAGE_KMOD_IPV6
-       prompt "kmod-ipv6......................... IPv6 support"
-       tristate
-       default m
-       help
-         Kernel modules for IPv6 protocol support
-
 config PACKAGE_KMOD_RING
        prompt "kmod-ring......................... PF Ring"
        tristate
@@ -342,13 +328,11 @@ config PACKAGE_KMOD_NET_PRISM54
 endmenu
 
 menu "PCMCIA/CardBus support"
-       depends LINUX_2_4_X86 || LINUX_2_6_X86 || LINUX_2_4_BRCM || LINUX_2_6_BRCM
+       depends PCMCIA_SUPPORT
 
 config PACKAGE_KMOD_PCMCIA_CORE
        prompt "kmod-pcmcia-core.................. PCMCIA/CardBus support"
-       depends PCMCIA_SUPPORT
        tristate
-       depends LINUX_2_4_X86 || LINUX_2_6_X86 || LINUX_2_4_BRCM || LINUX_2_6_BRCM
        default m
 
 config PACKAGE_KMOD_PCMCIA_SERIAL
@@ -360,11 +344,11 @@ config PACKAGE_KMOD_PCMCIA_SERIAL
 endmenu
 
 menu "USB support"
+       depends USB_SUPPORT
 
 config PACKAGE_KMOD_USB
        prompt "kmod-usb-core..................... USB support"
        tristate
-       default n if LINUX_2_4_AR531X
        default m
 
 config PACKAGE_KMOD_USB_UHCI 
@@ -482,8 +466,8 @@ config PACKAGE_KMOD_AX25
 config PACKAGE_KMOD_BLUETOOTH
        prompt "kmod-bluetooth.................... Bluetooth drivers and network stack"
        tristate
+       depends PCI_SUPPORT || USB_SUPPORT
        default m
-       default n if LINUX_2_4_AR531X
        help
          Bluetooth drivers and network stack