fix svn compressed patch breakage in libnet

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

diff --git a/openwrt/target/linux/Config.in b/openwrt/target/linux/Config.in
index e4189bd..f59ba78 100644 (file)
--- a/openwrt/target/linux/Config.in
+++ b/openwrt/target/linux/Config.in
@@ -1,6 +1,6 @@
 
 config BR2_LINUX_2_4
-       bool "Linux 2.4"
+       bool "Linux 2.4 (choose only one target board)"
        default y
 
 config BR2_LINUX_2_4_BRCM
@@ -54,6 +54,7 @@ config BR2_LINUX_2_6_BRCM
        depends BR2_LINUX_2_6
        select BR2_PACKAGE_KMOD_B44
        select BR2_PACKAGE_KMOD_MADWIFI
+       select BR2_PACKAGE_ROBOCFG
        help
          Build firmware images for Broadcom based routers
          (e.g. Netgear WGT634u)
@@ -85,12 +86,6 @@ config BR2_PACKAGE_KMOD_CPMAC
        help
          Driver for the AR7 CPMAC network chip
 
-config BR2_PACKAGE_KMOD_DIAG
-       tristate "Router LED/Button Driver"
-       default y
-       help
-         Driver for the LEDs on Wireless Routers (diag)
-
 config BR2_PACKAGE_KMOD_BRCM_WL
        tristate "Broadcom Wireless Network Driver"
        depends BR2_LINUX_2_4_BRCM
@@ -167,13 +162,20 @@ config BR2_PACKAGE_KMOD_CIFS
        help
          Kernel modules for CIFS support
 
+config BR2_PACKAGE_KMOD_SOUNDCORE
+       tristate "Soundcard support"
+       default n
+       help
+         Base support for soundcards
+         Requires either USB soundcard support (OSS) or ALSA package to be useful
+
 config BR2_PACKAGE_KMOD_USB
        tristate "USB support"
        default m
 
 config BR2_PACKAGE_KMOD_USB_CONTROLLER
        tristate
-       depends on BR2_PACKAGE_KMOD_USB_UHCI || BR2_PACKAGE_KMOD_USB_OHCI
+       depends on BR2_PACKAGE_KMOD_USB_UHCI || BR2_PACKAGE_KMOD_USB_OHCI || BR2_PACKAGE_KMOD_USB2
        default n
 
 config BR2_PACKAGE_KMOD_USB_UHCI
@@ -191,7 +193,8 @@ config BR2_PACKAGE_KMOD_USB_OHCI
 config BR2_PACKAGE_KMOD_USB2
        tristate "Support for USB 2.0 controllers"
        default m
-       depends BR2_PACKAGE_KMOD_USB_CONTROLLER
+       depends BR2_PACKAGE_KMOD_USB
+       select BR2_PACKAGE_KMOD_USB_CONTROLLER
 
 config BR2_PACKAGE_KMOD_USB_SERIAL
        tristate "kmod-usb-serial - Support for USB-to-serial converters"
@@ -232,6 +235,7 @@ config BR2_PACKAGE_KMOD_USB_AUDIO
        tristate "Support for USB soundcards"
        default m
        depends BR2_PACKAGE_KMOD_USB_CONTROLLER
+       select BR2_PACKAGE_KMOD_SOUNDCORE
 
 config BR2_PACKAGE_KMOD_USB_ACM
        tristate "Support for USB modems/isdn controllers"
@@ -248,6 +252,8 @@ config BR2_PACKAGE_KMOD_IDE
 config BR2_PACKAGE_KMOD_VFAT
        tristate "VFAT filesystem support"
        default m
+       depends on BR2_PACKAGE_KMOD_NLS_BASE
+       depends on BR2_PACKAGE_KMOD_NLS_CP437 || BR2_PACKAGE_KMOD_NLS_CP850
        help
          Kernel modules for VFAT filesystem support
          useful for usb mass storage devices
@@ -356,6 +362,36 @@ config BR2_PACKAGE_KMOD_SCHED
        help
          Kernel schedulers for IP traffic
 
+config BR2_PACKAGE_KMOD_NLS_BASE
+       tristate "basic native language support for filesystems"
+       default m
+       help
+         Kernel native language support
+
+config BR2_PACKAGE_KMOD_NLS_CP437
+       tristate "code page 437"
+       default m
+       help
+         Kernel native language support
+
+config BR2_PACKAGE_KMOD_NLS_CP850
+       tristate "code page 850"
+       default m
+       help
+         Kernel native language support
+
+config BR2_PACKAGE_KMOD_NLS_UTF8
+       tristate "utf8"
+       default m
+       help
+         Kernel native language support
+
+config BR2_PACKAGE_KMOD_NLS_IS08859_1
+       tristate "iso8859-1"
+       default m
+       help
+         Kernel native language support
+
 config BR2_PACKAGE_KMOD_VIDEODEV
        tristate "Video (For Linux) kernel support"
        default m