[x86] resync kernel configurations, patch from Hauke Mehrtens (#4396)

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

diff --git a/target/linux/olpc/config-2.6.27 b/target/linux/olpc/config-2.6.27
index 31c2be5..b48d300 100644 (file)
--- a/target/linux/olpc/config-2.6.27
+++ b/target/linux/olpc/config-2.6.27
@@ -4,7 +4,6 @@ CONFIG_ACPI=y
 CONFIG_ACPI_AC=y
 # CONFIG_ACPI_ASUS is not set
 CONFIG_ACPI_BATTERY=y
 CONFIG_ACPI_AC=y
 # CONFIG_ACPI_ASUS is not set
 CONFIG_ACPI_BATTERY=y

-# CONFIG_ACPI_BAY is not set

 CONFIG_ACPI_BLACKLIST_YEAR=0
 CONFIG_ACPI_BUTTON=y
 # CONFIG_ACPI_CONTAINER is not set
 CONFIG_ACPI_BLACKLIST_YEAR=0
 CONFIG_ACPI_BUTTON=y
 # CONFIG_ACPI_CONTAINER is not set


@@ -45,7 +44,6 @@ CONFIG_ARCH_SUPPORTS_MSI=y
 CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y
 CONFIG_ARCH_SUSPEND_POSSIBLE=y
 CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
 CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y
 CONFIG_ARCH_SUSPEND_POSSIBLE=y
 CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y

-# CONFIG_AT24 is not set

 # CONFIG_ATM is not set
 # CONFIG_ATMEL is not set
 # CONFIG_AUDIT_ARCH is not set
 # CONFIG_ATM is not set
 # CONFIG_ATMEL is not set
 # CONFIG_AUDIT_ARCH is not set


@@ -295,7 +293,6 @@ CONFIG_HW_RANDOM_GEODE=y
 CONFIG_HW_RANDOM_VIA=y
 CONFIG_I2C=m
 CONFIG_I2C_BOARDINFO=y
 CONFIG_HW_RANDOM_VIA=y
 CONFIG_I2C=m
 CONFIG_I2C_BOARDINFO=y

-# CONFIG_I2C_ISCH is not set

 # CONFIG_I8K is not set
 # CONFIG_IDE is not set
 # CONFIG_IEEE80211 is not set
 # CONFIG_I8K is not set
 # CONFIG_IDE is not set
 # CONFIG_IEEE80211 is not set


@@ -358,9 +355,8 @@ CONFIG_LCD_CLASS_DEVICE=y
 # CONFIG_LCD_LTV350QV is not set
 # CONFIG_LCD_PLATFORM is not set
 # CONFIG_LCD_VGG2432A4 is not set
 # CONFIG_LCD_LTV350QV is not set
 # CONFIG_LCD_PLATFORM is not set
 # CONFIG_LCD_VGG2432A4 is not set

+# CONFIG_LEDS_ALIX is not set

 # CONFIG_LEDS_CLEVO_MAIL is not set
 # CONFIG_LEDS_CLEVO_MAIL is not set

-# CONFIG_LEDS_PCA9532 is not set
-# CONFIG_LEDS_PCA955X is not set

 CONFIG_LIBERTAS=m
 CONFIG_LIBERTAS_DEBUG=y
 # CONFIG_LIBERTAS_SDIO is not set
 CONFIG_LIBERTAS=m
 CONFIG_LIBERTAS_DEBUG=y
 # CONFIG_LIBERTAS_SDIO is not set


@@ -625,7 +621,6 @@ CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_EHCI_ROOT_HUB_TT=y
 CONFIG_USB_EHCI_TT_NEWSCHED=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_EHCI_ROOT_HUB_TT=y
 CONFIG_USB_EHCI_TT_NEWSCHED=y

-# CONFIG_USB_GSPCA is not set

 # CONFIG_USB_HID is not set
 # CONFIG_USB_KAWETH is not set
 # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
 # CONFIG_USB_HID is not set
 # CONFIG_USB_KAWETH is not set
 # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set


@@ -634,7 +629,6 @@ CONFIG_USB_OHCI_HCD=y
 # CONFIG_USB_PEGASUS is not set
 # CONFIG_USB_PRINTER is not set
 # CONFIG_USB_PWC is not set
 # CONFIG_USB_PEGASUS is not set
 # CONFIG_USB_PRINTER is not set
 # CONFIG_USB_PWC is not set

-# CONFIG_USB_S2255 is not set

 # CONFIG_USB_SERIAL is not set
 CONFIG_USB_STORAGE=y
 CONFIG_USB_SUPPORT=y
 # CONFIG_USB_SERIAL is not set
 CONFIG_USB_STORAGE=y
 CONFIG_USB_SUPPORT=y


@@ -657,7 +651,6 @@ CONFIG_VIDEO_MEDIA=m
 CONFIG_VIDEO_OV7670=m
 CONFIG_VIDEO_OVCAMCHIP=m
 CONFIG_VIDEO_SELECT=y
 CONFIG_VIDEO_OV7670=m
 CONFIG_VIDEO_OVCAMCHIP=m
 CONFIG_VIDEO_SELECT=y

-# CONFIG_VIDEO_SH_MOBILE_CEU is not set

 CONFIG_VIDEO_V4L1=m
 CONFIG_VIDEO_V4L2=m
 CONFIG_VIDEO_V4L2_COMMON=m
 CONFIG_VIDEO_V4L1=m
 CONFIG_VIDEO_V4L2=m
 CONFIG_VIDEO_V4L2_COMMON=m


@@ -712,6 +705,7 @@ CONFIG_X86_POPAD_OK=y
 # CONFIG_X86_PTDUMP is not set
 # CONFIG_X86_RDC321X is not set
 # CONFIG_X86_REBOOTFIXUPS is not set
 # CONFIG_X86_PTDUMP is not set
 # CONFIG_X86_RDC321X is not set
 # CONFIG_X86_REBOOTFIXUPS is not set

+# CONFIG_X86_RESERVE_LOW_64K is not set

 # CONFIG_X86_SPEEDSTEP_CENTRINO is not set
 # CONFIG_X86_SPEEDSTEP_ICH is not set
 # CONFIG_X86_SPEEDSTEP_LIB is not set
 # CONFIG_X86_SPEEDSTEP_CENTRINO is not set
 # CONFIG_X86_SPEEDSTEP_ICH is not set
 # CONFIG_X86_SPEEDSTEP_LIB is not set