From: Gabor Juhos <juhosg@openwrt.org>
Date: Thu, 25 Sep 2008 20:16:41 +0000 (+0000)
Subject: sync kernel config
X-Git-Tag: reboot~25516
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=3b7f041bce4450450429afeb26976f4176892ff7;p=openwrt%2Fstaging%2Fchunkeey.git

sync kernel config

SVN-Revision: 12711
---

diff --git a/target/linux/adm5120/router_be/config-2.6.26 b/target/linux/adm5120/router_be/config-2.6.26
index 415d0398f0..f4ff64c4fb 100644
--- a/target/linux/adm5120/router_be/config-2.6.26
+++ b/target/linux/adm5120/router_be/config-2.6.26
@@ -9,6 +9,7 @@ CONFIG_ADM5120_MACH_P_335=y
 # CONFIG_ADM5120_OEM_EDIMAX is not set
 # CONFIG_ADM5120_OEM_INFINEON is not set
 # CONFIG_ADM5120_OEM_MIKROTIK is not set
+# CONFIG_ADM5120_OEM_MOTOROLA is not set
 CONFIG_ADM5120_OEM_ZYXEL=y
 CONFIG_ADM5120_SOC_BGA=y
 CONFIG_ADM5120_WDT=y
@@ -83,7 +84,6 @@ CONFIG_GENERIC_CMOS_UPDATE=y
 CONFIG_GENERIC_FIND_NEXT_BIT=y
 CONFIG_GENERIC_GPIO=y
 # CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ is not set
-# CONFIG_GPIO_MCP23S08 is not set
 CONFIG_GPIO_SYSFS=y
 CONFIG_HAS_DMA=y
 CONFIG_HAS_IOMEM=y
@@ -266,7 +266,6 @@ CONFIG_USB=m
 CONFIG_USB_ADM5120_HCD=m
 CONFIG_USB_DEBUG=y
 CONFIG_USB_EHCI_HCD=m
-# CONFIG_USB_ISIGHTFW 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
diff --git a/target/linux/adm5120/router_le/config-2.6.26 b/target/linux/adm5120/router_le/config-2.6.26
index 3bca3a56cb..8e2b4220ba 100644
--- a/target/linux/adm5120/router_le/config-2.6.26
+++ b/target/linux/adm5120/router_le/config-2.6.26
@@ -106,7 +106,6 @@ CONFIG_GENERIC_CMOS_UPDATE=y
 CONFIG_GENERIC_FIND_NEXT_BIT=y
 CONFIG_GENERIC_GPIO=y
 # CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ is not set
-# CONFIG_GPIO_MCP23S08 is not set
 CONFIG_GPIO_SYSFS=y
 CONFIG_HAS_DMA=y
 CONFIG_HAS_IOMEM=y
diff --git a/target/linux/generic-2.6/config-2.6.26 b/target/linux/generic-2.6/config-2.6.26
index d3e9bb508b..5335c2a341 100644
--- a/target/linux/generic-2.6/config-2.6.26
+++ b/target/linux/generic-2.6/config-2.6.26
@@ -389,6 +389,7 @@ CONFIG_GENERIC_IRQ_PROBE=y
 CONFIG_GENERIC_TIME=y
 # CONFIG_GFS2_FS is not set
 CONFIG_GPIO_DEVICE=m
+# CONFIG_GPIO_MCP23S08 is not set
 # CONFIG_GPIO_PCA953X is not set
 # CONFIG_GPIO_PCF857X is not set
 # CONFIG_GPIO_SYSFS is not set