fix irq problem with the new brcm-2.4 system code

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

diff --git a/openwrt/target/linux/Config.in b/openwrt/target/linux/Config.in
index 7a41675..eae8b43 100644 (file)
--- a/openwrt/target/linux/Config.in
+++ b/openwrt/target/linux/Config.in
@@ -10,6 +10,7 @@ menu "Target Root Filesystem"
                bool "squashfs-lzma"
                default y
                depends !BR2_LINUX_2_6_ARUBA
                bool "squashfs-lzma"
                default y
                depends !BR2_LINUX_2_6_ARUBA

+               depends !BR2_LINUX_2_6_XSCALE

                help
                  Build a squashfs-lzma root filesystem
 
                help
                  Build a squashfs-lzma root filesystem
 


@@ -53,6 +54,13 @@ config BR2_PACKAGE_KMOD_IMQ
         help
           Kernel support for the Intermediate Queueing device
 
         help
           Kernel support for the Intermediate Queueing device
 

+config BR2_PACKAGE_KMOD_IPIP
+       prompt "kmod-ipip......................... IP in IP encapsulation support"
+       tristate
+       default m
+       help
+         Kernel module for IP in IP encapsulation
+

 config BR2_PACKAGE_KMOD_IPV6
        prompt "kmod-ipv6......................... IPv6 support"
        tristate
 config BR2_PACKAGE_KMOD_IPV6
        prompt "kmod-ipv6......................... IPv6 support"
        tristate


@@ -230,6 +238,8 @@ config BR2_PACKAGE_KMOD_IPT_NAT_EXTRA
            * ip_nat_proto_gre
            * ip_conntrack_pptp
            * ip_nat_pptp
            * ip_nat_proto_gre
            * ip_conntrack_pptp
            * ip_nat_pptp

+           * ip_conntrack_sip
+           * ip_nat_sip

            * ip_nat_snmp_basic
            * ip_conntrack_tftp
 
            * ip_nat_snmp_basic
            * ip_conntrack_tftp
 


@@ -616,10 +626,10 @@ config BR2_PACKAGE_KMOD_USB
        default n if BR2_LINUX_2_4_AR531X
        default m
 
        default n if BR2_LINUX_2_4_AR531X
        default m
 

-config BR2_PACKAGE_KMOD_USB_UHCI
+config BR2_PACKAGE_KMOD_USB_UHCI 

        prompt   "kmod-usb-uhci................... Support for UHCI controllers"
        tristate
        prompt   "kmod-usb-uhci................... Support for UHCI controllers"
        tristate

-       default m
+       default n if BR2_LINUX_2_6_AU1000

        depends BR2_PACKAGE_KMOD_USB
        select BR2_PACKAGE_KMOD_USB_CONTROLLER
 
        depends BR2_PACKAGE_KMOD_USB
        select BR2_PACKAGE_KMOD_USB_CONTROLLER
 


@@ -633,7 +643,7 @@ config BR2_PACKAGE_KMOD_USB_OHCI
 config BR2_PACKAGE_KMOD_USB2
        prompt   "kmod-usb2....................... Support for USB 2.0 controllers"
        tristate
 config BR2_PACKAGE_KMOD_USB2
        prompt   "kmod-usb2....................... Support for USB 2.0 controllers"
        tristate

-       default m
+       default n if BR2_LINUX_2_6_AU1000

        depends BR2_PACKAGE_KMOD_USB
        select BR2_PACKAGE_KMOD_USB_CONTROLLER
 
        depends BR2_PACKAGE_KMOD_USB
        select BR2_PACKAGE_KMOD_USB_CONTROLLER
 


@@ -692,7 +702,7 @@ config BR2_PACKAGE_KMOD_USB_SERIAL_PL2303
        depends BR2_PACKAGE_KMOD_USB_SERIAL
 
 config BR2_PACKAGE_KMOD_USB_SERIAL_VISOR
        depends BR2_PACKAGE_KMOD_USB_SERIAL
 
 config BR2_PACKAGE_KMOD_USB_SERIAL_VISOR

-       prompt   "kmod-usb-serial-visor.......... Support for Handspring Visor / Palm m50x / Sony Clie Driver"
+       prompt   "kmod-usb-serial-visor........... Support for Handspring Visor / Palm m50x / Sony Clie Driver"

        tristate
        default m
        depends BR2_PACKAGE_KMOD_USB_SERIAL
        tristate
        default m
        depends BR2_PACKAGE_KMOD_USB_SERIAL


@@ -710,7 +720,7 @@ config BR2_PACKAGE_KMOD_USB_ATM
        depends BR2_PACKAGE_KMOD_USB_CONTROLLER
 
 config BR2_PACKAGE_KMOD_USB_ATM_SPEEDTOUCH
        depends BR2_PACKAGE_KMOD_USB_CONTROLLER
 
 config BR2_PACKAGE_KMOD_USB_ATM_SPEEDTOUCH

-        prompt "kmod-usb-atm-speedtouch........... Support for USB Speedtouch ADSL modem"
+        prompt   "kmod-usb-atm-speedtouch......... Support for USB Speedtouch ADSL modem"

        tristate
        default m
        depends BR2_PACKAGE_KMOD_USB_ATM
        tristate
        default m
        depends BR2_PACKAGE_KMOD_USB_ATM


@@ -744,7 +754,7 @@ config BR2_PACKAGE_KMOD_LP
          Kernel modules for line printer and parallel port support
 
 config BR2_PACKAGE_KMOD_SOFTDOG
          Kernel modules for line printer and parallel port support
 
 config BR2_PACKAGE_KMOD_SOFTDOG

-       prompt "kmod-softdog..................... software watchdog"
+       prompt "kmod-softdog...................... Software watchdog"

        tristate
        default m
        help
        tristate
        default m
        help