[adm5120] sync 2.6.26 config

SVN-Revision: 11955

diff --git a/target/linux/adm5120/router_be/config-2.6.26 b/target/linux/adm5120/router_be/config-2.6.26
index 8636a9a55f60a9984e9b0faef60c5ce46990e5ff..8d78fc512fb3249afc36b2dc2b1c84080a1e4119 100644 (file)
--- a/target/linux/adm5120/router_be/config-2.6.26
+++ b/target/linux/adm5120/router_be/config-2.6.26
@@ -105,7 +105,6 @@ CONFIG_INOTIFY_USER=y
 CONFIG_INPUT=m
 # CONFIG_INPUT_EVDEV is not set
 CONFIG_IPV6_MIP6=m
 CONFIG_INPUT=m
 # CONFIG_INPUT_EVDEV is not set
 CONFIG_IPV6_MIP6=m

-# CONFIG_IPV6_MROUTE is not set

 CONFIG_IPV6_NDISC_NODETYPE=y
 CONFIG_IPV6_PRIVACY=y
 CONFIG_IPV6_ROUTE_INFO=y
 CONFIG_IPV6_NDISC_NODETYPE=y
 CONFIG_IPV6_PRIVACY=y
 CONFIG_IPV6_ROUTE_INFO=y


@@ -267,23 +266,14 @@ CONFIG_TMPFS_POSIX_ACL=y
 # CONFIG_TOSHIBA_RBTX4938 is not set
 CONFIG_TRAD_SIGNALS=y
 CONFIG_USB=m
 # CONFIG_TOSHIBA_RBTX4938 is not set
 CONFIG_TRAD_SIGNALS=y
 CONFIG_USB=m

-# CONFIG_USBPCWATCHDOG is not set

 CONFIG_USB_ADM5120_HCD=m
 CONFIG_USB_ADM5120_HCD=m

-# CONFIG_USB_C67X00_HCD is not set

 CONFIG_USB_DEBUG=y
 CONFIG_USB_EHCI_HCD=m
 CONFIG_USB_DEBUG=y
 CONFIG_USB_EHCI_HCD=m

-CONFIG_USB_HSO=m

 # CONFIG_USB_ISIGHTFW is not set
 # CONFIG_USB_ISIGHTFW is not set

-# CONFIG_USB_ISP1760_HCD is not set

 # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
 # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
 CONFIG_USB_OHCI_HCD=m
 # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
 # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
 CONFIG_USB_OHCI_HCD=m

-# CONFIG_USB_R8A66597_HCD is not set
-CONFIG_USB_SERIAL_MOTOROLA=m
-CONFIG_USB_SERIAL_SPCP8X5=m
-# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set

 # CONFIG_USB_UHCI_HCD is not set
 # CONFIG_USB_UHCI_HCD is not set

-# CONFIG_USB_WDM is not set

 # CONFIG_VGASTATE is not set
 # CONFIG_VIDEO_ALLOW_V4L1 is not set
 CONFIG_VIDEO_MEDIA=m
 # CONFIG_VGASTATE is not set
 # CONFIG_VIDEO_ALLOW_V4L1 is not set
 CONFIG_VIDEO_MEDIA=m

diff --git a/target/linux/adm5120/router_le/config-2.6.26 b/target/linux/adm5120/router_le/config-2.6.26
index 7508390966a018c08b4ddff59abf092c704e1836..056e5cbbf97eb0f715274fc55d79659e5e40115f 100644 (file)
--- a/target/linux/adm5120/router_le/config-2.6.26
+++ b/target/linux/adm5120/router_le/config-2.6.26
@@ -105,7 +105,6 @@ CONFIG_INOTIFY_USER=y
 CONFIG_INPUT=m
 # CONFIG_INPUT_EVDEV is not set
 CONFIG_IPV6_MIP6=m
 CONFIG_INPUT=m
 # CONFIG_INPUT_EVDEV is not set
 CONFIG_IPV6_MIP6=m

-# CONFIG_IPV6_MROUTE is not set

 CONFIG_IPV6_NDISC_NODETYPE=y
 CONFIG_IPV6_PRIVACY=y
 CONFIG_IPV6_ROUTE_INFO=y
 CONFIG_IPV6_NDISC_NODETYPE=y
 CONFIG_IPV6_PRIVACY=y
 CONFIG_IPV6_ROUTE_INFO=y


@@ -277,23 +276,14 @@ CONFIG_TMPFS_POSIX_ACL=y
 # CONFIG_TOSHIBA_RBTX4938 is not set
 CONFIG_TRAD_SIGNALS=y
 CONFIG_USB=m
 # CONFIG_TOSHIBA_RBTX4938 is not set
 CONFIG_TRAD_SIGNALS=y
 CONFIG_USB=m

-# CONFIG_USBPCWATCHDOG is not set

 CONFIG_USB_ADM5120_HCD=m
 CONFIG_USB_ADM5120_HCD=m

-# CONFIG_USB_C67X00_HCD is not set

 CONFIG_USB_DEBUG=y
 CONFIG_USB_EHCI_HCD=m
 CONFIG_USB_DEBUG=y
 CONFIG_USB_EHCI_HCD=m

-CONFIG_USB_HSO=m

 # CONFIG_USB_ISIGHTFW is not set
 # CONFIG_USB_ISIGHTFW is not set

-# CONFIG_USB_ISP1760_HCD is not set

 # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
 # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
 CONFIG_USB_OHCI_HCD=m
 # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
 # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
 CONFIG_USB_OHCI_HCD=m

-# CONFIG_USB_R8A66597_HCD is not set
-CONFIG_USB_SERIAL_MOTOROLA=m
-CONFIG_USB_SERIAL_SPCP8X5=m
-# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set

 # CONFIG_USB_UHCI_HCD is not set
 # CONFIG_USB_UHCI_HCD is not set

-# CONFIG_USB_WDM is not set

 # CONFIG_VGASTATE is not set
 # CONFIG_VIDEO_ALLOW_V4L1 is not set
 CONFIG_VIDEO_MEDIA=m
 # CONFIG_VGASTATE is not set
 # CONFIG_VIDEO_ALLOW_V4L1 is not set
 CONFIG_VIDEO_MEDIA=m