X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=target%2Flinux%2Folpc%2Fconfig-2.6.23;h=e6e17080f7f2b66c29b5269d77f0047105aa1f89;hb=b8b055bc8e55cf8cd1bd114b9321546d98e43c54;hp=6d566c42bb4ef51f409c00e10a5ef69e9ddd6823;hpb=ab01217894a54a088699f346a50908b0f3fc60fc;p=openwrt-10.03%2F.git

diff --git a/target/linux/olpc/config-2.6.23 b/target/linux/olpc/config-2.6.23
index 6d566c42b..e6e17080f 100644
--- a/target/linux/olpc/config-2.6.23
+++ b/target/linux/olpc/config-2.6.23
@@ -439,9 +439,9 @@ 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=y
 CONFIG_PCI_DIRECT=y
 # CONFIG_PCI_GOANY is not set
 # CONFIG_PCI_GOBIOS is not set
@@ -483,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
@@ -525,7 +526,6 @@ CONFIG_USB_STORAGE=y
 # CONFIG_USB_SUSPEND is not set
 CONFIG_USB_UHCI_HCD=y
 # CONFIG_USER_NS is not set
-CONFIG_V4L_USB_DRIVERS=y
 # CONFIG_VFAT_FS is not set
 CONFIG_VGACON_SOFT_SCROLLBACK=y
 CONFIG_VGACON_SOFT_SCROLLBACK_SIZE=64