x86: sync 2.6.39 configs

SVN-Revision: 31749

1 files changed, 26 insertions, 50 deletions

diff --git a/target/linux/x86/olpc/config-default b/target/linux/x86/olpc/config-default
index 084d9df33c..7529ac6f31 100644
--- a/target/linux/x86/olpc/config-default
+++ b/target/linux/x86/olpc/config-default
@@ -1,16 +1,7 @@
-# CONFIG_ACER_WMI is not set
-CONFIG_ACPI_AC=y
-CONFIG_ACPI_BATTERY=y
-CONFIG_ACPI_BUTTON=y
-CONFIG_ACPI_FAN=y
-CONFIG_ACPI_PROCFS_POWER=y
-CONFIG_ACPI_PROC_EVENT=y
-CONFIG_ACPI_SLEEP=y
 # CONFIG_APM is not set
 CONFIG_BACKLIGHT_CLASS_DEVICE=y
 CONFIG_BACKLIGHT_GENERIC=y
 CONFIG_BACKLIGHT_LCD_SUPPORT=y
-# CONFIG_BACKLIGHT_MBP_NVIDIA is not set
 # CONFIG_BACKLIGHT_PROGEAR is not set
 # CONFIG_BACKLIGHT_SAHARA is not set
 CONFIG_BATTERY_OLPC=y
@@ -19,27 +10,20 @@ CONFIG_BLK_DEV_SR=y
 CONFIG_BLK_DEV_SR_VENDOR=y
 # CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
 CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0
-# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
-CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0
 CONFIG_CAN_PM_TRACE=y
 CONFIG_CHR_DEV_SG=y
-# CONFIG_COMPAL_LAPTOP is not set
 # CONFIG_CPA_DEBUG is not set
 # CONFIG_CPU_FREQ_STAT_DETAILS is not set
 CONFIG_CPU_IDLE_GOV_MENU=y
 # CONFIG_DEBUG_BOOT_PARAMS is not set
-CONFIG_DEBUG_BUGVERBOSE=y
 CONFIG_DEBUG_KERNEL=y
 # CONFIG_DEBUG_NX_TEST is not set
-# CONFIG_DEBUG_PAGEALLOC is not set
-# CONFIG_DEBUG_RODATA is not set
-# CONFIG_DEBUG_STACKOVERFLOW is not set
+# CONFIG_DEBUG_PERF_USE_VMALLOC is not set
+# CONFIG_DEBUG_STRICT_USER_COPY_CHECKS is not set
 # CONFIG_DEBUG_VIRTUAL is not set
 CONFIG_DECOMPRESS_LZO=y
 CONFIG_DETECT_HUNG_TASK=y
-CONFIG_DETECT_SOFTLOCKUP=y
 CONFIG_DISPLAY_SUPPORT=y
-CONFIG_DMIID=y
 # CONFIG_EMBEDDED is not set
 CONFIG_FB=y
 CONFIG_FB_CFB_COPYAREA=y
@@ -49,66 +33,61 @@ CONFIG_FB_GEODE=y
 # CONFIG_FB_GEODE_GX is not set
 # CONFIG_FB_GEODE_GX1 is not set
 CONFIG_FB_GEODE_LX=y
+# CONFIG_FB_OLPC_DCON is not set
+# CONFIG_FB_SM7XX is not set
 # CONFIG_FB_VESA is not set
+# CONFIG_FB_WMT_GE_ROPS is not set
+# CONFIG_FB_XGI is not set
 # CONFIG_FIRMWARE_EDID is not set
-# CONFIG_FONTS is not set
-CONFIG_FONT_8x16=y
-CONFIG_FONT_8x8=y
-CONFIG_FRAMEBUFFER_CONSOLE=y
-CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
-CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
 CONFIG_FREEZER=y
-# CONFIG_FUJITSU_LAPTOP is not set
-CONFIG_GEODE_MFGPT_TIMER=y
+CONFIG_GENERIC_GPIO=y
+CONFIG_GPIOLIB=y
 # CONFIG_HAMRADIO is not set
-CONFIG_HAVE_PERF_EVENTS=y
+CONFIG_HIBERNATE_CALLBACKS=y
 CONFIG_HIBERNATION=y
-CONFIG_HIBERNATION_NVS=y
-# CONFIG_HPET is not set
-CONFIG_INPUT_EVDEV=y
-# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
-CONFIG_INPUT_MOUSEDEV_SCREEN_X=1200
-CONFIG_INPUT_MOUSEDEV_SCREEN_Y=900
-# CONFIG_ISA is not set
-# CONFIG_KALLSYMS_ALL is not set
+# CONFIG_HIGHMEM64G is not set
 # CONFIG_KEXEC_JUMP is not set
 CONFIG_LCD_CLASS_DEVICE=y
-# CONFIG_LCD_ILI9320 is not set
 # CONFIG_LCD_PLATFORM is not set
+CONFIG_LZO_COMPRESS=y
 CONFIG_LZO_DECOMPRESS=y
 # CONFIG_M486 is not set
 # CONFIG_MATH_EMULATION is not set
 CONFIG_MGEODE_LX=y
-# CONFIG_MICROCODE is not set
 # CONFIG_MISC_DEVICES is not set
 CONFIG_MMC=y
-# CONFIG_MMC_AT91 is not set
-# CONFIG_MMC_ATMELMCI is not set
 CONFIG_MMC_BLOCK=y
 CONFIG_MMC_SDHCI=y
+# CONFIG_MMC_SDHCI_OF is not set
 # CONFIG_MMC_SDHCI_PCI is not set
 # CONFIG_MMC_SDHCI_PLTFM is not set
 # CONFIG_MMC_TIFM_SD is not set
 # CONFIG_MMC_WBSD is not set
-CONFIG_MOUSE_PS2_OLPC=y
-# CONFIG_MSI_LAPTOP is not set
 CONFIG_MTD_CMDLINE_PARTS=y
+CONFIG_MTD_OF_PARTS=y
 # CONFIG_MTRR is not set
 # CONFIG_NETDEV_1000 is not set
 # CONFIG_NETWORK_FILESYSTEMS is not set
 # CONFIG_NET_ETHERNET is not set
 CONFIG_NLS=y
 CONFIG_NO_HZ=y
+CONFIG_OF=y
+CONFIG_OF_ADDRESS=y
+CONFIG_OF_DEVICE=y
+CONFIG_OF_GPIO=y
+CONFIG_OF_IRQ=y
+CONFIG_OF_NET=y
+CONFIG_OF_PCI=y
 CONFIG_OLPC=y
 CONFIG_OPROFILE=y
 # CONFIG_OPROFILE_EVENT_MULTIPLEX is not set
-# CONFIG_PANASONIC_LAPTOP is not set
 # CONFIG_PARTITION_ADVANCED is not set
 # CONFIG_PCI_GOANY is not set
 CONFIG_PCI_GOOLPC=y
 CONFIG_PCI_OLPC=y
-# CONFIG_PCIEPORTBUS is not set
 CONFIG_PERF_COUNTERS=y
+CONFIG_PM=y
+# CONFIG_PM_ADVANCED_DEBUG is not set
 CONFIG_PM_DEBUG=y
 CONFIG_PM_SLEEP=y
 CONFIG_PM_STD_PARTITION=""
@@ -116,6 +95,7 @@ CONFIG_PM_STD_PARTITION=""
 # CONFIG_PM_VERBOSE is not set
 # CONFIG_PREEMPT_NONE is not set
 CONFIG_PREEMPT_VOLUNTARY=y
+# CONFIG_PROC_DEVICETREE is not set
 CONFIG_PROFILING=y
 CONFIG_RD_LZO=y
 CONFIG_RELAY=y
@@ -124,6 +104,7 @@ CONFIG_RING_BUFFER_ALLOW_SWAP=y
 CONFIG_SCHEDSTATS=y
 CONFIG_SCHED_DEBUG=y
 # CONFIG_SCx200 is not set
+# CONFIG_SERIAL_OF_PLATFORM is not set
 CONFIG_SUSPEND=y
 CONFIG_SUSPEND_FREEZER=y
 CONFIG_TIMER_STATS=y
@@ -134,23 +115,18 @@ CONFIG_USB_EHCI_TT_NEWSCHED=y
 # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
 CONFIG_USB_OHCI_HCD=y
 CONFIG_USB_STORAGE=y
-CONFIG_USB_SUSPEND=y
 CONFIG_USB_UHCI_HCD=y
-CONFIG_VGACON_SOFT_SCROLLBACK=y
-CONFIG_VGACON_SOFT_SCROLLBACK_SIZE=64
 CONFIG_VGA_ARB=y
+CONFIG_VGA_ARB_MAX_GPUS=16
 # CONFIG_WATCHDOG is not set
+CONFIG_X86_CMOV=y
 CONFIG_X86_DEBUGCTLMSR=y
-# CONFIG_X86_DS is not set
 # CONFIG_X86_ELAN is not set
 CONFIG_X86_EXTENDED_PLATFORM=y
-CONFIG_X86_L1_CACHE_SHIFT=5
 # CONFIG_X86_MCE is not set
-# CONFIG_X86_MRST is not set
 # CONFIG_X86_PTDUMP is not set
 # CONFIG_X86_RDC321X is not set
 # CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS is not set
-# CONFIG_X86_RESERVE_LOW_64K is not set
 CONFIG_X86_TSC=y
 CONFIG_X86_USE_3DNOW=y
 CONFIG_X86_USE_PPRO_CHECKSUM=y