upgrade orion to 2.6.26-rc5

[openwrt.git] / target / linux / olpc / config-2.6.23

diff --git a/target/linux/olpc/config-2.6.23 b/target/linux/olpc/config-2.6.23
index f50d227..e6e1708 100644 (file)
--- a/target/linux/olpc/config-2.6.23
+++ b/target/linux/olpc/config-2.6.23
@@ -198,6 +198,7 @@ CONFIG_HW_RANDOM_VIA=y
 CONFIG_I2C=y
 # CONFIG_I2C_ALGOBIT is not set
 CONFIG_I2C_BOARDINFO=y
+CONFIG_I2C_CHARDEV=y
 # CONFIG_I6300ESB_WDT is not set
 # CONFIG_I8K is not set
 # CONFIG_IB700_WDT is not set
@@ -438,6 +439,7 @@ CONFIG_PAGE_OFFSET=0xC0000000
 # CONFIG_PARAVIRT is not set
 CONFIG_PC8736x_GPIO=m
 # CONFIG_PC87413_WDT is not set
+CONFIG_PCI=y
 # CONFIG_PCIEPORTBUS is not set
 # CONFIG_PCIPCWATCHDOG is not set
 CONFIG_PCI_DIRECT=y
@@ -481,6 +483,7 @@ CONFIG_SCSI=y
 CONFIG_SCSI_WAIT_SCAN=m
 # CONFIG_SCx200 is not set
 # CONFIG_SCx200_ACB is not set
+# CONFIG_SDIO_UART is not set
 CONFIG_SEMAPHORE_SLEEPERS=y
 # CONFIG_SERIAL_8250_EXTENDED is not set
 CONFIG_SERIAL_8250_PCI=y
@@ -530,7 +533,6 @@ CONFIG_VGACON_SOFT_SCROLLBACK_SIZE=64
 CONFIG_VGA_CONSOLE=y
 # CONFIG_VGA_NOPROBE is not set
 # CONFIG_VIA_RHINE is not set
-# CONFIG_VIDEO_DEV is not set
 CONFIG_VIDEO_SELECT=y
 CONFIG_VIRTUALIZATION=y
 CONFIG_VM86=y