brcm47xx: update bcma and ssb to master-2011-07-21

[openwrt.git] / target / linux / x86 / config-default

diff --git a/target/linux/x86/config-default b/target/linux/x86/config-default
index 0b0981b..1d20fd6 100644 (file)
--- a/target/linux/x86/config-default
+++ b/target/linux/x86/config-default
@@ -72,6 +72,7 @@ CONFIG_CPU_IDLE_GOV_LADDER=y
 # CONFIG_CPU_SUP_TRANSMETA_32 is not set
 # CONFIG_CPU_SUP_UMC_32 is not set
 # CONFIG_CS5535_GPIO is not set
 # CONFIG_CPU_SUP_TRANSMETA_32 is not set
 # CONFIG_CPU_SUP_UMC_32 is not set
 # CONFIG_CS5535_GPIO is not set

+# CONFIG_GPIO_CS5535 is not set

 # CONFIG_CS89x0 is not set
 # CONFIG_DCDBAS is not set
 # CONFIG_DEBUG_BOOT_PARAMS is not set
 # CONFIG_CS89x0 is not set
 # CONFIG_DCDBAS is not set
 # CONFIG_DEBUG_BOOT_PARAMS is not set


@@ -101,7 +102,7 @@ CONFIG_EARLY_PRINTK=y
 CONFIG_ELF_CORE=y
 # CONFIG_ELPLUS is not set
 # CONFIG_EUROTECH_WDT is not set
 CONFIG_ELF_CORE=y
 # CONFIG_ELPLUS is not set
 # CONFIG_EUROTECH_WDT is not set

-CONFIG_EXT2_FS=y
+CONFIG_EXT4_FS=y

 CONFIG_FIRMWARE_IN_KERNEL=y
 CONFIG_FIRMWARE_MEMMAP=y
 CONFIG_FIX_EARLYCON_MEM=y
 CONFIG_FIRMWARE_IN_KERNEL=y
 CONFIG_FIRMWARE_MEMMAP=y
 CONFIG_FIX_EARLYCON_MEM=y


@@ -219,6 +220,7 @@ CONFIG_M486=y
 # CONFIG_M586TSC is not set
 # CONFIG_M686 is not set
 # CONFIG_MACHZ_WDT is not set
 # CONFIG_M586TSC is not set
 # CONFIG_M686 is not set
 # CONFIG_MACHZ_WDT is not set

+CONFIG_X86_RESERVE_LOW=64

 CONFIG_MATH_EMULATION=y
 # CONFIG_MATOM is not set
 # CONFIG_MCA is not set
 CONFIG_MATH_EMULATION=y
 # CONFIG_MATOM is not set
 # CONFIG_MCA is not set


@@ -259,6 +261,7 @@ CONFIG_NET_VENDOR_3COM=y
 # CONFIG_NET_VENDOR_SMC is not set
 CONFIG_NOHIGHMEM=y
 CONFIG_NR_CPUS=1
 # CONFIG_NET_VENDOR_SMC is not set
 CONFIG_NOHIGHMEM=y
 CONFIG_NR_CPUS=1

+# CONFIG_IRQ_TIME_ACCOUNTING is not set

 # CONFIG_NSC_GPIO is not set
 CONFIG_NVRAM=y
 # CONFIG_OLPC is not set
 # CONFIG_NSC_GPIO is not set
 CONFIG_NVRAM=y
 # CONFIG_OLPC is not set


@@ -268,7 +271,7 @@ CONFIG_OUTPUT_FORMAT="elf32-i386"
 CONFIG_PAGEFLAGS_EXTENDED=y
 CONFIG_PAGE_OFFSET=0xC0000000
 # CONFIG_PARAVIRT_GUEST is not set
 CONFIG_PAGEFLAGS_EXTENDED=y
 CONFIG_PAGE_OFFSET=0xC0000000
 # CONFIG_PARAVIRT_GUEST is not set

-CONFIG_PATA_AMD=y
+# CONFIG_PATA_AMD is not set

 CONFIG_PATA_MPIIX=y
 CONFIG_PATA_OLDPIIX=y
 CONFIG_PATA_SC1200=y
 CONFIG_PATA_MPIIX=y
 CONFIG_PATA_OLDPIIX=y
 CONFIG_PATA_SC1200=y


@@ -313,6 +316,7 @@ CONFIG_RWSEM_XCHGADD_ALGORITHM=y
 # CONFIG_SBC7240_WDT is not set
 # CONFIG_SBC8360_WDT is not set
 # CONFIG_SBC_EPX_C3_WATCHDOG is not set
 # CONFIG_SBC7240_WDT is not set
 # CONFIG_SBC8360_WDT is not set
 # CONFIG_SBC_EPX_C3_WATCHDOG is not set

+# CONFIG_F71808E_WDT is not set

 # CONFIG_SC1200_WDT is not set
 # CONFIG_SC520_WDT is not set
 # CONFIG_SCHED_HRTICK is not set
 # CONFIG_SC1200_WDT is not set
 # CONFIG_SC520_WDT is not set
 # CONFIG_SCHED_HRTICK is not set


@@ -323,6 +327,7 @@ CONFIG_SCx200HR_TIMER=y
 # CONFIG_SCx200_GPIO is not set
 # CONFIG_SCx200_WDT is not set
 # CONFIG_SENSORS_K10TEMP is not set
 # CONFIG_SCx200_GPIO is not set
 # CONFIG_SCx200_WDT is not set
 # CONFIG_SENSORS_K10TEMP is not set

+# CONFIG_SENSORS_PKGTEMP is not set

 # CONFIG_SENSORS_VIA_CPUTEMP is not set
 # CONFIG_SERIAL_8250_EXTENDED is not set
 CONFIG_SERIAL_8250_PCI=y
 # CONFIG_SENSORS_VIA_CPUTEMP is not set
 # CONFIG_SERIAL_8250_EXTENDED is not set
 CONFIG_SERIAL_8250_PCI=y


@@ -334,6 +339,7 @@ CONFIG_SERIO_LIBPS2=y
 # CONFIG_SERIO_PCIPS2 is not set
 # CONFIG_SERIO_RAW is not set
 CONFIG_SERIO_SERPORT=y
 # CONFIG_SERIO_PCIPS2 is not set
 # CONFIG_SERIO_RAW is not set
 CONFIG_SERIO_SERPORT=y

+# CONFIG_SERIO_PS2MULT is not set

 # CONFIG_SLAB is not set
 CONFIG_SLUB=y
 CONFIG_SLUB_DEBUG=y
 # CONFIG_SLAB is not set
 CONFIG_SLUB=y
 CONFIG_SLUB_DEBUG=y


@@ -352,6 +358,7 @@ CONFIG_THERMAL=y
 # CONFIG_TOPSTAR_LAPTOP is not set
 # CONFIG_TOSHIBA is not set
 # CONFIG_TOSHIBA_BT_RFKILL is not set
 # CONFIG_TOPSTAR_LAPTOP is not set
 # CONFIG_TOSHIBA is not set
 # CONFIG_TOSHIBA_BT_RFKILL is not set

+# CONFIG_IBM_RTL is not set

 # CONFIG_TREE_PREEMPT_RCU is not set
 CONFIG_TREE_RCU=y
 # CONFIG_TYPHOON is not set
 # CONFIG_TREE_PREEMPT_RCU is not set
 CONFIG_TREE_RCU=y
 # CONFIG_TYPHOON is not set


@@ -375,6 +382,7 @@ CONFIG_VM_EVENT_COUNTERS=y
 CONFIG_X86=y
 CONFIG_X86_32=y
 CONFIG_X86_32_LAZY_GS=y
 CONFIG_X86=y
 CONFIG_X86_32=y
 CONFIG_X86_32_LAZY_GS=y

+# CONFIG_X86_32_IRIS is not set

 # CONFIG_X86_64 is not set
 # CONFIG_X86_ACPI_CPUFREQ is not set
 CONFIG_X86_ALIGNMENT_16=y
 # CONFIG_X86_64 is not set
 # CONFIG_X86_ACPI_CPUFREQ is not set
 CONFIG_X86_ALIGNMENT_16=y


@@ -434,3 +442,5 @@ CONFIG_X86_VERBOSE_BOOTUP=y
 CONFIG_X86_WP_WORKS_OK=y
 CONFIG_X86_XADD=y
 # CONFIG_ZONE_DMA32 is not set
 CONFIG_X86_WP_WORKS_OK=y
 CONFIG_X86_XADD=y
 # CONFIG_ZONE_DMA32 is not set

+# CONFIG_BATTERY_BQ20Z75 is not set
+# CONFIG_TRANSPARENT_HUGEPAGE is not set