From: Gabor Juhos Date: Thu, 21 May 2009 19:39:44 +0000 (+0000) Subject: sync kernel config X-Git-Tag: reboot~23492 X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=cf935e761391c3178280d28cbac2639bfe7698e5;p=openwrt%2Fstaging%2Flynxis.git sync kernel config SVN-Revision: 15971 --- diff --git a/target/linux/adm5120/router_be/config-2.6.28 b/target/linux/adm5120/router_be/config-2.6.28 index 4500718fe8..144585eacb 100644 --- a/target/linux/adm5120/router_be/config-2.6.28 +++ b/target/linux/adm5120/router_be/config-2.6.28 @@ -66,7 +66,6 @@ CONFIG_DMA_NONCOHERENT=y CONFIG_EARLY_PRINTK=y CONFIG_ELF_CORE=y CONFIG_FIRMWARE_IN_KERNEL=y -# CONFIG_FREEZER is not set CONFIG_FS_POSIX_ACL=y CONFIG_GENERIC_ACL=y CONFIG_GENERIC_CLOCKEVENTS=y @@ -81,7 +80,6 @@ CONFIG_HARDWARE_WATCHPOINTS=y CONFIG_HAS_DMA=y CONFIG_HAS_IOMEM=y CONFIG_HAS_IOPORT=y -# CONFIG_HAVE_AOUT is not set CONFIG_HAVE_ARCH_KGDB=y # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set CONFIG_HAVE_IDE=y @@ -95,17 +93,15 @@ CONFIG_HZ=250 # CONFIG_HZ_100 is not set CONFIG_HZ_250=y # CONFIG_I2C is not set -# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set -# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set -# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set # CONFIG_IDE is not set CONFIG_INITRAMFS_SOURCE="" CONFIG_INOTIFY=y CONFIG_INOTIFY_USER=y CONFIG_INPUT=m +# CONFIG_INPUT_GPIO_BUTTONS is not set +# CONFIG_INPUT_YEALINK is not set CONFIG_IRQ_CPU=y # CONFIG_ISDN is not set -CONFIG_KMOD=y CONFIG_LEDS_GPIO=m CONFIG_LEDS_TRIGGER_ADM5120_SWITCH=m CONFIG_LEGACY_PTYS=y @@ -118,8 +114,6 @@ CONFIG_LEGACY_PTY_COUNT=256 # CONFIG_MACH_TX39XX is not set # CONFIG_MACH_TX49XX is not set # CONFIG_MACH_VR41XX is not set -# CONFIG_MFD_CORE is not set -# CONFIG_MFD_TMIO is not set CONFIG_MII=m # CONFIG_MIKROTIK_RB532 is not set CONFIG_MIPS=y @@ -139,21 +133,15 @@ CONFIG_MTD_CFI_FIXUP_MACRONIX_BOOTLOC=y CONFIG_MTD_CMDLINE_PARTS=y CONFIG_MTD_TRXSPLIT=y # CONFIG_NET_PCI is not set -# CONFIG_NF_DEFRAG_IPV4 is not set # CONFIG_NO_IOPORT is not set # CONFIG_NXP_STB220 is not set # CONFIG_NXP_STB225 is not set CONFIG_PAGEFLAGS_EXTENDED=y -# CONFIG_PAGE_SIZE_16KB is not set -CONFIG_PAGE_SIZE_4KB=y -# CONFIG_PAGE_SIZE_64KB is not set -# CONFIG_PAGE_SIZE_8KB is not set # CONFIG_PARTITION_ADVANCED is not set CONFIG_PCI=y CONFIG_PCI_DISABLE_COMMON_QUIRKS=y CONFIG_PCI_DOMAINS=y # CONFIG_PCSPKR_PLATFORM is not set -# CONFIG_PHYS_ADDR_T_64BIT is not set # CONFIG_PMC_MSP is not set # CONFIG_PMC_YOSEMITE is not set # CONFIG_PNX8550_JBS is not set diff --git a/target/linux/adm5120/router_le/config-2.6.28 b/target/linux/adm5120/router_le/config-2.6.28 index abc67da6f9..c005048a94 100644 --- a/target/linux/adm5120/router_le/config-2.6.28 +++ b/target/linux/adm5120/router_le/config-2.6.28 @@ -87,7 +87,6 @@ CONFIG_DMA_NONCOHERENT=y CONFIG_EARLY_PRINTK=y CONFIG_ELF_CORE=y CONFIG_FIRMWARE_IN_KERNEL=y -# CONFIG_FREEZER is not set CONFIG_FS_POSIX_ACL=y CONFIG_GENERIC_ACL=y CONFIG_GENERIC_CLOCKEVENTS=y @@ -103,7 +102,6 @@ CONFIG_HARDWARE_WATCHPOINTS=y CONFIG_HAS_DMA=y CONFIG_HAS_IOMEM=y CONFIG_HAS_IOPORT=y -# CONFIG_HAVE_AOUT is not set CONFIG_HAVE_ARCH_KGDB=y # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set CONFIG_HAVE_IDE=y @@ -120,9 +118,6 @@ CONFIG_HZ=250 # CONFIG_HZ_100 is not set CONFIG_HZ_250=y # CONFIG_I2C is not set -# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set -# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set -# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set # CONFIG_IDE is not set CONFIG_IEEE80211=m CONFIG_IEEE80211_CRYPT_WEP=m @@ -130,16 +125,16 @@ CONFIG_INITRAMFS_SOURCE="" CONFIG_INOTIFY=y CONFIG_INOTIFY_USER=y CONFIG_INPUT=m +# CONFIG_INPUT_GPIO_BUTTONS is not set +# CONFIG_INPUT_YEALINK is not set CONFIG_IRQ_CPU=y # CONFIG_ISDN is not set CONFIG_KEXEC=y -CONFIG_KMOD=y CONFIG_LEDS_GPIO=m CONFIG_LEDS_TRIGGER_ADM5120_SWITCH=m CONFIG_LEGACY_PTYS=y CONFIG_LEGACY_PTY_COUNT=256 # CONFIG_LEMOTE_FULONG is not set -CONFIG_LLC=m # CONFIG_MACH_ALCHEMY is not set # CONFIG_MACH_DECSTATION is not set # CONFIG_MACH_EMMA is not set @@ -147,8 +142,6 @@ CONFIG_LLC=m # CONFIG_MACH_TX39XX is not set # CONFIG_MACH_TX49XX is not set # CONFIG_MACH_VR41XX is not set -# CONFIG_MFD_CORE is not set -# CONFIG_MFD_TMIO is not set CONFIG_MII=m # CONFIG_MIKROTIK_RB532 is not set CONFIG_MIPS=y @@ -171,16 +164,11 @@ CONFIG_MTD_NAND=y CONFIG_MTD_NAND_PLATFORM=y CONFIG_MTD_TRXSPLIT=y # CONFIG_NATSEMI is not set -# CONFIG_NF_DEFRAG_IPV4 is not set CONFIG_NO_HZ=y # CONFIG_NO_IOPORT is not set # CONFIG_NXP_STB220 is not set # CONFIG_NXP_STB225 is not set CONFIG_PAGEFLAGS_EXTENDED=y -# CONFIG_PAGE_SIZE_16KB is not set -CONFIG_PAGE_SIZE_4KB=y -# CONFIG_PAGE_SIZE_64KB is not set -# CONFIG_PAGE_SIZE_8KB is not set # CONFIG_PARTITION_ADVANCED is not set CONFIG_PATA_RB153_CF=m # CONFIG_PATA_SCH is not set @@ -188,7 +176,6 @@ CONFIG_PCI=y CONFIG_PCI_DISABLE_COMMON_QUIRKS=y CONFIG_PCI_DOMAINS=y # CONFIG_PCSPKR_PLATFORM is not set -# CONFIG_PHYS_ADDR_T_64BIT is not set # CONFIG_PMC_MSP is not set # CONFIG_PMC_YOSEMITE is not set # CONFIG_PNX8550_JBS is not set @@ -226,7 +213,6 @@ CONFIG_SERIO_SERPORT=y # CONFIG_SLAB is not set CONFIG_SLUB=y CONFIG_SOFT_WATCHDOG=m -CONFIG_STP=m # CONFIG_SWAP is not set CONFIG_SYS_HAS_CPU_MIPS32_R1=y CONFIG_SYS_HAS_EARLY_PRINTK=y