diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2012-05-16 10:44:52 +0000 |
|---|---|---|
| committer | Gabor Juhos <juhosg@openwrt.org> | 2012-05-16 10:44:52 +0000 |
| commit | 19f691f8e4abbe399df66ee5f83077b1bded0a66 (patch) | |
| tree | 663ea0ca418ae477fe641e4ce78ecfc2ed0f29d1 /target | |
| parent | 724fd5e6578b008822066b4d9670ae88c3ac63ed (diff) | |
| download | upstream-19f691f8e4abbe399df66ee5f83077b1bded0a66.tar.gz upstream-19f691f8e4abbe399df66ee5f83077b1bded0a66.tar.bz2 upstream-19f691f8e4abbe399df66ee5f83077b1bded0a66.zip | |
x86: sync 3.2 configs
SVN-Revision: 31750
Diffstat (limited to 'target')
| -rw-r--r-- | target/linux/x86/alix2/config-default | 14 | ||||
| -rw-r--r-- | target/linux/x86/config-3.2 | 7 | ||||
| -rw-r--r-- | target/linux/x86/net5501/config-default | 7 |
3 files changed, 14 insertions, 14 deletions
diff --git a/target/linux/x86/alix2/config-default b/target/linux/x86/alix2/config-default index cc3de96809..ee7e3a780f 100644 --- a/target/linux/x86/alix2/config-default +++ b/target/linux/x86/alix2/config-default @@ -1,21 +1,25 @@ CONFIG_ALIX=y -# CONFIG_AMD_NB is not set +CONFIG_DEBUG_BUGVERBOSE=y CONFIG_DMI=y CONFIG_DMIID=y # CONFIG_DMI_SYSFS is not set -CONFIG_DEBUG_BUGVERBOSE=y -# CONFIG_FB_GEODE is not set CONFIG_GENERIC_GPIO=y +# CONFIG_GEOS is not set CONFIG_GPIOLIB=y CONFIG_GPIO_SYSFS=y # CONFIG_HIGHMEM64G is not set CONFIG_HWMON=y +# CONFIG_LEDS_CLEVO_MAIL is not set # CONFIG_M486 is not set # CONFIG_MATH_EMULATION is not set CONFIG_MGEODE_LX=y +CONFIG_NLS=y CONFIG_PATA_CS5536=y -# CONFIG_PCIEPORTBUS is not set -CONFIG_PCSPKR_PLATFORM=y +CONFIG_PCI_LABEL=y # CONFIG_SCx200 is not set CONFIG_THERMAL_HWMON=y +CONFIG_X86_CMOV=y CONFIG_X86_DEBUGCTLMSR=y +CONFIG_X86_TSC=y +CONFIG_X86_USE_3DNOW=y +CONFIG_X86_USE_PPRO_CHECKSUM=y diff --git a/target/linux/x86/config-3.2 b/target/linux/x86/config-3.2 index a9a3b8b905..8cc09fbd85 100644 --- a/target/linux/x86/config-3.2 +++ b/target/linux/x86/config-3.2 @@ -88,7 +88,6 @@ CONFIG_EXT4_FS=y CONFIG_FIRMWARE_IN_KERNEL=y CONFIG_FIRMWARE_MEMMAP=y CONFIG_FIX_EARLYCON_MEM=y -# CONFIG_FRAME_POINTER is not set CONFIG_FS_MBCACHE=y CONFIG_GENERIC_BUG=y CONFIG_GENERIC_CLOCKEVENTS=y @@ -101,7 +100,6 @@ CONFIG_GENERIC_IOMAP=y CONFIG_GENERIC_IRQ_SHOW=y CONFIG_GENERIC_ISA_DMA=y # CONFIG_GENERIC_TIME_VSYSCALL is not set -# CONFIG_GEOS is not set # CONFIG_GOOGLE_FIRMWARE is not set # CONFIG_HANGCHECK_TIMER is not set CONFIG_HAS_DMA=y @@ -248,10 +246,6 @@ CONFIG_OUTPUT_FORMAT="elf32-i386" CONFIG_PAGEFLAGS_EXTENDED=y CONFIG_PAGE_OFFSET=0xC0000000 # CONFIG_PARAVIRT_GUEST is not set -# CONFIG_PATA_MPIIX is not set -# CONFIG_PATA_OLDPIIX is not set -# CONFIG_PATA_SC1200 is not set -# CONFIG_PATA_VIA is not set # CONFIG_PC8736x_GPIO is not set # CONFIG_PC87413_WDT is not set CONFIG_PCI=y @@ -277,7 +271,6 @@ CONFIG_PROC_PAGE_MONITOR=y CONFIG_RD_BZIP2=y CONFIG_RD_GZIP=y # CONFIG_RELOCATABLE is not set -CONFIG_RTC=y CONFIG_RTC_CLASS=y # CONFIG_RWSEM_GENERIC_SPINLOCK is not set CONFIG_RWSEM_XCHGADD_ALGORITHM=y diff --git a/target/linux/x86/net5501/config-default b/target/linux/x86/net5501/config-default index 224b7d3244..462f8a6f25 100644 --- a/target/linux/x86/net5501/config-default +++ b/target/linux/x86/net5501/config-default @@ -1,7 +1,5 @@ -# CONFIG_AMD_NB is not set # CONFIG_ATA_PIIX is not set CONFIG_DEBUG_BUGVERBOSE=y -# CONFIG_FB_GEODE is not set CONFIG_GENERIC_GPIO=y CONFIG_GPIOLIB=y CONFIG_GPIO_SYSFS=y @@ -15,3 +13,8 @@ CONFIG_NET5501=y CONFIG_PATA_CS5536=y # CONFIG_SCx200 is not set CONFIG_THERMAL_HWMON=y +CONFIG_X86_CMOV=y +CONFIG_X86_DEBUGCTLMSR=y +CONFIG_X86_TSC=y +CONFIG_X86_USE_3DNOW=y +CONFIG_X86_USE_PPRO_CHECKSUM=y |