From: Gabor Juhos Date: Thu, 10 Jun 2010 08:58:14 +0000 (+0000) Subject: generic: move some common symbols to generic configuration X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=2f328ce488eb50e08e8caf82a51bb7177ad356f2;p=openwrt%2Fstaging%2Fnbd.git generic: move some common symbols to generic configuration * CONFIG_MUTEX_SPIN_ON_OWNER * CONFIG_DEFAULT_HYDLA * CONFIG_DEFAULT_VENO SVN-Revision: 21748 --- diff --git a/target/linux/ar71xx/config-2.6.33 b/target/linux/ar71xx/config-2.6.33 index 3e06625af9..cd4deb8ab8 100644 --- a/target/linux/ar71xx/config-2.6.33 +++ b/target/linux/ar71xx/config-2.6.33 @@ -177,7 +177,6 @@ CONFIG_MTD_MYLOADER_PARTS=y CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-2 CONFIG_MTD_REDBOOT_PARTS=y CONFIG_MTD_WRT160NL_PARTS=y -# CONFIG_MUTEX_SPIN_ON_OWNER is not set CONFIG_MYLOADER=y CONFIG_NET_DSA=y CONFIG_NET_DSA_AR7240=y diff --git a/target/linux/ar71xx/config-2.6.35 b/target/linux/ar71xx/config-2.6.35 index 900609f44b..3a719a88a3 100644 --- a/target/linux/ar71xx/config-2.6.35 +++ b/target/linux/ar71xx/config-2.6.35 @@ -101,8 +101,6 @@ CONFIG_CPU_SUPPORTS_HIGHMEM=y CONFIG_CSRC_R4K=y CONFIG_CSRC_R4K_LIB=y CONFIG_DECOMPRESS_LZMA=y -# CONFIG_DEFAULT_HYBLA is not set -# CONFIG_DEFAULT_VENO is not set CONFIG_DEVPORT=y # CONFIG_DM9000 is not set CONFIG_DMA_NONCOHERENT=y diff --git a/target/linux/atheros/config-2.6.33 b/target/linux/atheros/config-2.6.33 index 8c646bc8fc..fc0d9c85fc 100644 --- a/target/linux/atheros/config-2.6.33 +++ b/target/linux/atheros/config-2.6.33 @@ -127,7 +127,6 @@ CONFIG_MTD_MYLOADER_PARTS=y CONFIG_MTD_PHYSMAP=y CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-3 CONFIG_MTD_REDBOOT_PARTS=y -# CONFIG_MUTEX_SPIN_ON_OWNER is not set CONFIG_MVSWITCH_PHY=y # CONFIG_NET_PCI is not set # CONFIG_NO_IOPORT is not set diff --git a/target/linux/atheros/config-2.6.34 b/target/linux/atheros/config-2.6.34 index 671015e744..a2d02b5c7d 100644 --- a/target/linux/atheros/config-2.6.34 +++ b/target/linux/atheros/config-2.6.34 @@ -133,7 +133,6 @@ CONFIG_MTD_MYLOADER_PARTS=y CONFIG_MTD_PHYSMAP=y CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-3 CONFIG_MTD_REDBOOT_PARTS=y -# CONFIG_MUTEX_SPIN_ON_OWNER is not set CONFIG_MVSWITCH_PHY=y CONFIG_NEED_DMA_MAP_STATE=y # CONFIG_NET_PCI is not set diff --git a/target/linux/atheros/config-2.6.35 b/target/linux/atheros/config-2.6.35 index bb8bf882b6..1b4dd92746 100644 --- a/target/linux/atheros/config-2.6.35 +++ b/target/linux/atheros/config-2.6.35 @@ -69,8 +69,6 @@ CONFIG_CROSS_COMPILE="" CONFIG_CSRC_R4K=y CONFIG_CSRC_R4K_LIB=y CONFIG_DECOMPRESS_LZMA=y -# CONFIG_DEFAULT_HYBLA is not set -# CONFIG_DEFAULT_VENO is not set CONFIG_DEVPORT=y # CONFIG_DM9000 is not set CONFIG_DMA_NONCOHERENT=y diff --git a/target/linux/brcm47xx/config-2.6.33 b/target/linux/brcm47xx/config-2.6.33 index 1c44f94f91..510ea4d257 100644 --- a/target/linux/brcm47xx/config-2.6.33 +++ b/target/linux/brcm47xx/config-2.6.33 @@ -122,7 +122,6 @@ CONFIG_MIPS_MT_DISABLED=y # CONFIG_MIPS_MT_SMTC is not set # CONFIG_MIPS_SIM is not set CONFIG_MTD_BCM47XX=y -# CONFIG_MUTEX_SPIN_ON_OWNER is not set CONFIG_NO_HZ=y # CONFIG_NO_IOPORT is not set # CONFIG_NXP_STB220 is not set diff --git a/target/linux/brcm47xx/config-2.6.34 b/target/linux/brcm47xx/config-2.6.34 index cba016953b..2345352a3a 100644 --- a/target/linux/brcm47xx/config-2.6.34 +++ b/target/linux/brcm47xx/config-2.6.34 @@ -131,7 +131,6 @@ CONFIG_MIPS_MT_DISABLED=y # CONFIG_MIPS_MT_SMTC is not set # CONFIG_MIPS_SIM is not set CONFIG_MTD_BCM47XX=y -# CONFIG_MUTEX_SPIN_ON_OWNER is not set CONFIG_NEED_DMA_MAP_STATE=y CONFIG_NO_HZ=y # CONFIG_NO_IOPORT is not set diff --git a/target/linux/brcm47xx/config-2.6.35 b/target/linux/brcm47xx/config-2.6.35 index efedddf753..66ff4a4e01 100644 --- a/target/linux/brcm47xx/config-2.6.35 +++ b/target/linux/brcm47xx/config-2.6.35 @@ -70,8 +70,6 @@ CONFIG_CSRC_R4K=y CONFIG_CSRC_R4K_LIB=y # CONFIG_DEBUG_FS is not set CONFIG_DECOMPRESS_LZMA=y -# CONFIG_DEFAULT_HYBLA is not set -# CONFIG_DEFAULT_VENO is not set CONFIG_DEVPORT=y # CONFIG_DM9000 is not set CONFIG_DMA_NONCOHERENT=y diff --git a/target/linux/brcm63xx/config-2.6.33 b/target/linux/brcm63xx/config-2.6.33 index 8c49f472fe..79864a1465 100644 --- a/target/linux/brcm63xx/config-2.6.33 +++ b/target/linux/brcm63xx/config-2.6.33 @@ -162,7 +162,6 @@ CONFIG_MTD_CONCAT=y CONFIG_MTD_JEDECPROBE=y CONFIG_MTD_REDBOOT_PARTS=y CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED=y -# CONFIG_MUTEX_SPIN_ON_OWNER is not set # CONFIG_NL80211_TESTMODE is not set # CONFIG_NO_IOPORT is not set # CONFIG_NXP_STB220 is not set diff --git a/target/linux/generic-2.6/config-2.6.33 b/target/linux/generic-2.6/config-2.6.33 index 2eb4f6500a..664b508ff9 100644 --- a/target/linux/generic-2.6/config-2.6.33 +++ b/target/linux/generic-2.6/config-2.6.33 @@ -1386,6 +1386,7 @@ CONFIG_MTD_ROOTFS_SPLIT=y # CONFIG_MTD_TESTS is not set # CONFIG_MTD_UBI is not set CONFIG_MTD=y +# CONFIG_MUTEX_SPIN_ON_OWNER is not set # CONFIG_MV643XX_ETH is not set # CONFIG_MVSWITCH_PHY is not set # CONFIG_MWAVE is not set diff --git a/target/linux/generic-2.6/config-2.6.35 b/target/linux/generic-2.6/config-2.6.35 index 6985acf608..5a17144016 100644 --- a/target/linux/generic-2.6/config-2.6.35 +++ b/target/linux/generic-2.6/config-2.6.35 @@ -491,12 +491,14 @@ CONFIG_DECOMPRESS_LZMA_NEEDED=y # CONFIG_DEFAULT_CUBIC is not set CONFIG_DEFAULT_DEADLINE=y # CONFIG_DEFAULT_HTCP is not set +# CONFIG_DEFAULT_HYBLA is not set CONFIG_DEFAULT_IOSCHED="deadline" CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 # CONFIG_DEFAULT_NOOP is not set # CONFIG_DEFAULT_RENO is not set CONFIG_DEFAULT_TCP_CONG="westwood" # CONFIG_DEFAULT_VEGAS is not set +# CONFIG_DEFAULT_VENO is not set CONFIG_DEFAULT_WESTWOOD=y CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" # CONFIG_DETECT_HUNG_TASK is not set diff --git a/target/linux/ixp4xx/config-2.6.33 b/target/linux/ixp4xx/config-2.6.33 index 75a932e25e..8ac52f3c51 100644 --- a/target/linux/ixp4xx/config-2.6.33 +++ b/target/linux/ixp4xx/config-2.6.33 @@ -137,7 +137,6 @@ CONFIG_MTD_CFI_ADV_OPTIONS=y CONFIG_MTD_IXP4XX=y CONFIG_MTD_OTP=y CONFIG_MTD_REDBOOT_PARTS=y -# CONFIG_MUTEX_SPIN_ON_OWNER is not set CONFIG_NO_HZ=y CONFIG_PAGEFLAGS_EXTENDED=y CONFIG_PAGE_OFFSET=0xC0000000 diff --git a/target/linux/mpc83xx/config-2.6.33 b/target/linux/mpc83xx/config-2.6.33 index 1dc5186ef7..704c812e9b 100644 --- a/target/linux/mpc83xx/config-2.6.33 +++ b/target/linux/mpc83xx/config-2.6.33 @@ -208,7 +208,6 @@ CONFIG_MTD_UBI_BEB_RESERVE=1 # CONFIG_MTD_UBI_DEBUG is not set # CONFIG_MTD_UBI_GLUEBI is not set CONFIG_MTD_UBI_WL_THRESHOLD=4096 -# CONFIG_MUTEX_SPIN_ON_OWNER is not set # CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set # CONFIG_NETFILTER is not set # CONFIG_NETWORK_FILESYSTEMS is not set diff --git a/target/linux/mx2/config-2.6.34 b/target/linux/mx2/config-2.6.34 index 2b3e52f909..d9a47f1fd6 100644 --- a/target/linux/mx2/config-2.6.34 +++ b/target/linux/mx2/config-2.6.34 @@ -112,7 +112,6 @@ CONFIG_MACH_VP6500=y # CONFIG_MTD_CFI_INTELEXT is not set CONFIG_MTD_CMDLINE_PARTS=y CONFIG_MTD_PHYSMAP=y -# CONFIG_MUTEX_SPIN_ON_OWNER is not set # CONFIG_MXC_IRQ_PRIOR is not set # CONFIG_MXC_PWM is not set CONFIG_NEED_DMA_MAP_STATE=y diff --git a/target/linux/rb532/config-2.6.33 b/target/linux/rb532/config-2.6.33 index 4648c042aa..a2d353c3e3 100644 --- a/target/linux/rb532/config-2.6.33 +++ b/target/linux/rb532/config-2.6.33 @@ -135,7 +135,6 @@ CONFIG_MTD_NAND_VERIFY_WRITE=y CONFIG_MTD_PHYSMAP=y # CONFIG_MTD_ROOTFS_ROOT_DEV is not set # CONFIG_MTD_ROOTFS_SPLIT is not set -# CONFIG_MUTEX_SPIN_ON_OWNER is not set CONFIG_NF_CONNTRACK=y CONFIG_NF_CT_ACCT=y # CONFIG_NO_IOPORT is not set diff --git a/target/linux/rb532/config-2.6.34 b/target/linux/rb532/config-2.6.34 index 25ddd265c7..bd96260f95 100644 --- a/target/linux/rb532/config-2.6.34 +++ b/target/linux/rb532/config-2.6.34 @@ -145,7 +145,6 @@ CONFIG_MTD_NAND_VERIFY_WRITE=y CONFIG_MTD_PHYSMAP=y # CONFIG_MTD_ROOTFS_ROOT_DEV is not set # CONFIG_MTD_ROOTFS_SPLIT is not set -# CONFIG_MUTEX_SPIN_ON_OWNER is not set CONFIG_NEED_DMA_MAP_STATE=y CONFIG_NF_CONNTRACK=y CONFIG_NF_CT_ACCT=y