From: Gabor Juhos <juhosg@openwrt.org>
Date: Fri, 28 Nov 2008 21:35:28 +0000 (+0000)
Subject: sync kernel configs
X-Git-Tag: reboot~25139
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=ce5d8a935c323a0108a5f0080ad8a01cb16ddab3;p=openwrt%2Fstaging%2Fblogic.git

sync kernel configs

SVN-Revision: 13418
---

diff --git a/target/linux/adm5120/router_be/config-2.6.26 b/target/linux/adm5120/router_be/config-2.6.26
index f4ff64c4fb73..c34f80e61c3a 100644
--- a/target/linux/adm5120/router_be/config-2.6.26
+++ b/target/linux/adm5120/router_be/config-2.6.26
@@ -179,7 +179,6 @@ CONFIG_MTD_MAP_BANK_WIDTH_2=y
 CONFIG_MTD_MAP_BANK_WIDTH_4=y
 # CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
 # CONFIG_MTD_MTDRAM is not set
-# CONFIG_MTD_MYLOADER_PARTS is not set
 # CONFIG_MTD_ONENAND is not set
 CONFIG_MTD_PARTITIONS=y
 # CONFIG_MTD_PCI is not set
@@ -196,7 +195,6 @@ CONFIG_MTD_TRXSPLIT=y
 # CONFIG_NET_PKTGEN is not set
 # CONFIG_NET_VENDOR_3COM is not set
 # CONFIG_NO_IOPORT is not set
-# CONFIG_OCF_OCF is not set
 CONFIG_PAGEFLAGS_EXTENDED=y
 # CONFIG_PAGE_SIZE_16KB is not set
 CONFIG_PAGE_SIZE_4KB=y
@@ -254,8 +252,6 @@ CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y
 CONFIG_SYS_SUPPORTS_ARBIT_HZ=y
 CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y
 CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y
-# CONFIG_THERMAL is not set
-# CONFIG_THERMAL_HWMON is not set
 CONFIG_TICK_ONESHOT=y
 CONFIG_TMPFS_POSIX_ACL=y
 # CONFIG_TOSHIBA_JMR3927 is not set
diff --git a/target/linux/adm5120/router_be/config-2.6.27 b/target/linux/adm5120/router_be/config-2.6.27
index 9bb052e072ec..6fb638a5a01b 100644
--- a/target/linux/adm5120/router_be/config-2.6.27
+++ b/target/linux/adm5120/router_be/config-2.6.27
@@ -74,7 +74,6 @@ CONFIG_ELF_CORE=y
 # CONFIG_EXT3_FS_POSIX_ACL is not set
 # CONFIG_EXT3_FS_SECURITY is not set
 CONFIG_EXT3_FS_XATTR=y
-CONFIG_EXTRA_FIRMWARE=""
 CONFIG_FIRMWARE_IN_KERNEL=y
 CONFIG_FS_MBCACHE=m
 CONFIG_FS_POSIX_ACL=y
@@ -87,7 +86,6 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
 CONFIG_GENERIC_GPIO=y
 # CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ is not set
 CONFIG_GPIOLIB=y
-# CONFIG_GPIO_BT8XX is not set
 CONFIG_GPIO_SYSFS=y
 CONFIG_HAS_DMA=y
 CONFIG_HAS_IOMEM=y
@@ -182,7 +180,6 @@ CONFIG_MTD_MAP_BANK_WIDTH_2=y
 CONFIG_MTD_MAP_BANK_WIDTH_4=y
 # CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
 # CONFIG_MTD_MTDRAM is not set
-# CONFIG_MTD_MYLOADER_PARTS is not set
 # CONFIG_MTD_ONENAND is not set
 CONFIG_MTD_PARTITIONS=y
 # CONFIG_MTD_PCI is not set
@@ -247,7 +244,6 @@ CONFIG_SERIO_SERPORT=y
 # CONFIG_SLAB is not set
 CONFIG_SLUB=y
 CONFIG_SND_MIPS=y
-CONFIG_SND_USB=y
 CONFIG_SOFT_WATCHDOG=m
 # CONFIG_SPARSEMEM_STATIC is not set
 # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
@@ -260,8 +256,6 @@ CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y
 CONFIG_SYS_SUPPORTS_ARBIT_HZ=y
 CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y
 CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y
-# CONFIG_THERMAL is not set
-# CONFIG_THERMAL_HWMON is not set
 CONFIG_TICK_ONESHOT=y
 CONFIG_TMPFS_POSIX_ACL=y
 CONFIG_TRAD_SIGNALS=y
@@ -278,6 +272,5 @@ CONFIG_USB_SUPPORT=y
 CONFIG_VIDEO_MEDIA=m
 CONFIG_VIDEO_V4L2=m
 CONFIG_VIDEO_V4L2_COMMON=m
-# CONFIG_VLAN_8021Q_GVRP is not set
 CONFIG_VM_EVENT_COUNTERS=y
 CONFIG_ZONE_DMA_FLAG=0
diff --git a/target/linux/adm5120/router_le/config-2.6.26 b/target/linux/adm5120/router_le/config-2.6.26
index 8e2b4220bade..3b92242969c7 100644
--- a/target/linux/adm5120/router_le/config-2.6.26
+++ b/target/linux/adm5120/router_le/config-2.6.26
@@ -231,7 +231,6 @@ CONFIG_MTD_TRXSPLIT=y
 # CONFIG_NET_PKTGEN is not set
 # CONFIG_NET_VENDOR_3COM is not set
 # CONFIG_NO_IOPORT is not set
-# CONFIG_OCF_OCF is not set
 CONFIG_PAGEFLAGS_EXTENDED=y
 # CONFIG_PAGE_SIZE_16KB is not set
 CONFIG_PAGE_SIZE_4KB=y
@@ -293,8 +292,6 @@ CONFIG_SYS_SUPPORTS_ARBIT_HZ=y
 CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y
 CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y
 # CONFIG_TC35815 is not set
-# CONFIG_THERMAL is not set
-# CONFIG_THERMAL_HWMON is not set
 CONFIG_TICK_ONESHOT=y
 CONFIG_TMPFS_POSIX_ACL=y
 # CONFIG_TOSHIBA_JMR3927 is not set
diff --git a/target/linux/adm5120/router_le/config-2.6.27 b/target/linux/adm5120/router_le/config-2.6.27
index 71f47707b7c4..ba2de8062f84 100644
--- a/target/linux/adm5120/router_le/config-2.6.27
+++ b/target/linux/adm5120/router_le/config-2.6.27
@@ -96,7 +96,6 @@ CONFIG_ELF_CORE=y
 # CONFIG_EXT3_FS_POSIX_ACL is not set
 # CONFIG_EXT3_FS_SECURITY is not set
 CONFIG_EXT3_FS_XATTR=y
-CONFIG_EXTRA_FIRMWARE=""
 CONFIG_FIRMWARE_IN_KERNEL=y
 CONFIG_FS_MBCACHE=m
 CONFIG_FS_POSIX_ACL=y
@@ -109,7 +108,6 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
 CONFIG_GENERIC_GPIO=y
 # CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ is not set
 CONFIG_GPIOLIB=y
-# CONFIG_GPIO_BT8XX is not set
 CONFIG_GPIO_SYSFS=y
 CONFIG_HAS_DMA=y
 CONFIG_HAS_IOMEM=y
@@ -285,7 +283,6 @@ CONFIG_SERIO_SERPORT=y
 # CONFIG_SLAB is not set
 CONFIG_SLUB=y
 CONFIG_SND_MIPS=y
-CONFIG_SND_USB=y
 CONFIG_SOFT_WATCHDOG=m
 # CONFIG_SPARSEMEM_STATIC is not set
 # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
@@ -298,8 +295,6 @@ CONFIG_SYS_SUPPORTS_ARBIT_HZ=y
 CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y
 CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y
 # CONFIG_TC35815 is not set
-# CONFIG_THERMAL is not set
-# CONFIG_THERMAL_HWMON is not set
 CONFIG_TICK_ONESHOT=y
 CONFIG_TMPFS_POSIX_ACL=y
 CONFIG_TRAD_SIGNALS=y
@@ -316,7 +311,6 @@ CONFIG_USB_SUPPORT=y
 CONFIG_VIDEO_MEDIA=m
 CONFIG_VIDEO_V4L2=m
 CONFIG_VIDEO_V4L2_COMMON=m
-# CONFIG_VLAN_8021Q_GVRP is not set
 CONFIG_VM_EVENT_COUNTERS=y
 CONFIG_YAFFS_9BYTE_TAGS=y
 # CONFIG_YAFFS_ALWAYS_CHECK_CHUNK_ERASED is not set