restore olpc for i686

config

@@ -599,10 +599,12 @@ CONFIG_PCI=y
 # CONFIG_PCI_GOBIOS is not set
 # CONFIG_PCI_GOMMCONFIG is not set
 # CONFIG_PCI_GODIRECT is not set
+# CONFIG_PCI_GOOLPC is not set
 CONFIG_PCI_GOANY=y
 CONFIG_PCI_BIOS=y
 CONFIG_PCI_DIRECT=y
 CONFIG_PCI_MMCONFIG=y
+CONFIG_PCI_OLPC=y
 CONFIG_PCI_DOMAINS=y
 # CONFIG_PCI_CNB20LE_QUIRK is not set
 CONFIG_PCIEPORTBUS=y
@@ -629,7 +631,11 @@ CONFIG_ISA=y
 # CONFIG_EISA is not set
 # CONFIG_MCA is not set
 # CONFIG_SCx200 is not set
-# CONFIG_OLPC is not set
+CONFIG_OLPC=y
+CONFIG_OLPC_XO1_PM=y
+CONFIG_OLPC_XO1_RTC=y
+CONFIG_OLPC_XO1_SCI=y
+CONFIG_OLPC_XO15_SCI=y
 # CONFIG_ALIX is not set
 CONFIG_AMD_NB=y
 CONFIG_PCCARD=m
@@ -1341,6 +1347,7 @@ CONFIG_MTD_REDBOOT_PARTS=m
 CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1
 # CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set
 # CONFIG_MTD_REDBOOT_PARTS_READONLY is not set
+CONFIG_MTD_OF_PARTS=m
 CONFIG_MTD_AR7_PARTS=m
 
 #
@@ -1390,6 +1397,7 @@ CONFIG_MTD_ABSENT=m
 #
 CONFIG_MTD_COMPLEX_MAPPINGS=y
 # CONFIG_MTD_PHYSMAP is not set
+CONFIG_MTD_PHYSMAP_OF=m
 CONFIG_MTD_SC520CDP=m
 CONFIG_MTD_NETSC520=m
 CONFIG_MTD_TS5500=m
@@ -1461,6 +1469,23 @@ CONFIG_MTD_UBI_WL_THRESHOLD=4096
 CONFIG_MTD_UBI_BEB_RESERVE=1
 # CONFIG_MTD_UBI_GLUEBI is not set
 # CONFIG_MTD_UBI_DEBUG is not set
+CONFIG_OF=y
+
+#
+# Device Tree and Open Firmware support
+#
+CONFIG_PROC_DEVICETREE=y
+# CONFIG_OF_SELFTEST is not set
+CONFIG_OF_PROMTREE=y
+CONFIG_OF_ADDRESS=y
+CONFIG_OF_IRQ=y
+CONFIG_OF_DEVICE=y
+CONFIG_OF_GPIO=y
+CONFIG_OF_I2C=m
+CONFIG_OF_NET=y
+CONFIG_OF_MDIO=m
+CONFIG_OF_PCI=y
+CONFIG_OF_PCI_IRQ=y
 CONFIG_PARPORT=m
 CONFIG_PARPORT_PC=m
 CONFIG_PARPORT_SERIAL=m
@@ -2631,6 +2656,7 @@ CONFIG_MOUSE_PS2_TRACKPOINT=y
 CONFIG_MOUSE_PS2_ELANTECH=y
 CONFIG_MOUSE_PS2_SENTELIC=y
 # CONFIG_MOUSE_PS2_TOUCHKIT is not set
+CONFIG_MOUSE_PS2_OLPC=y
 CONFIG_MOUSE_SERIAL=y
 CONFIG_MOUSE_APPLETOUCH=m
 CONFIG_MOUSE_BCM5974=m
@@ -2822,6 +2848,7 @@ CONFIG_SERIAL_8250_CS=m
 CONFIG_SERIAL_8250_NR_UARTS=32
 CONFIG_SERIAL_8250_RUNTIME_UARTS=4
 # CONFIG_SERIAL_8250_EXTENDED is not set
+CONFIG_SERIAL_8250_DW=m
 
 #
 # Non-8250 serial port support
@@ -2831,6 +2858,7 @@ CONFIG_SERIAL_UARTLITE=m
 CONFIG_SERIAL_CORE=y
 CONFIG_SERIAL_CORE_CONSOLE=y
 CONFIG_SERIAL_JSM=m
+CONFIG_SERIAL_OF_PLATFORM=m
 CONFIG_SERIAL_TIMBERDALE=m
 CONFIG_SERIAL_ALTERA_JTAGUART=m
 CONFIG_SERIAL_ALTERA_UART=m
@@ -2938,7 +2966,8 @@ CONFIG_I2C_GPIO=m
 CONFIG_I2C_INTEL_MID=m
 CONFIG_I2C_OCORES=m
 CONFIG_I2C_PCA_PLATFORM=m
-# CONFIG_I2C_PXA_PCI is not set
+CONFIG_I2C_PXA=m
+CONFIG_I2C_PXA_PCI=y
 CONFIG_I2C_SIMTEC=m
 CONFIG_I2C_XILINX=m
 CONFIG_I2C_EG20T=m
@@ -3013,7 +3042,7 @@ CONFIG_GPIO_ADP5588=m
 #
 # PCI GPIO expanders:
 #
-CONFIG_GPIO_CS5535=m
+CONFIG_GPIO_CS5535=y
 CONFIG_GPIO_LANGWELL=y
 CONFIG_GPIO_PCH=m
 CONFIG_GPIO_ML_IOH=m
@@ -3066,6 +3095,7 @@ CONFIG_TEST_POWER=m
 # CONFIG_BATTERY_DS2760 is not set
 # CONFIG_BATTERY_DS2780 is not set
 # CONFIG_BATTERY_DS2782 is not set
+CONFIG_BATTERY_OLPC=m
 # CONFIG_BATTERY_SBS is not set
 # CONFIG_BATTERY_BQ27x00 is not set
 # CONFIG_BATTERY_MAX17040 is not set
@@ -4921,6 +4951,7 @@ CONFIG_COMEDI_NI_LABPC=m
 CONFIG_COMEDI_8255=m
 CONFIG_COMEDI_DAS08=m
 CONFIG_COMEDI_FC=m
+# CONFIG_FB_OLPC_DCON is not set
 CONFIG_ASUS_OLED=m
 # CONFIG_PANEL is not set
 CONFIG_R8187SE=m
@@ -5077,6 +5108,7 @@ CONFIG_TOSHIBA_BT_RFKILL=m
 CONFIG_ACPI_CMPC=m
 CONFIG_INTEL_IPS=m
 CONFIG_IBM_RTL=m
+CONFIG_XO1_RFKILL=m
 CONFIG_XO15_EBOOK=m
 CONFIG_SAMSUNG_LAPTOP=m
 CONFIG_MXM_WMI=m