[octeon] resync kernel configuration

[openwrt.git] / target / linux / goldfish / config-2.6.30

diff --git a/target/linux/goldfish/config-2.6.30 b/target/linux/goldfish/config-2.6.30
index a238a34..072a241 100644 (file)
--- a/target/linux/goldfish/config-2.6.30
+++ b/target/linux/goldfish/config-2.6.30
@@ -13,7 +13,6 @@ CONFIG_ARM=y
 CONFIG_ARM_THUMB=y
 # CONFIG_BACKTRACE_SELF_TEST is not set
 CONFIG_BASE_SMALL=0
-# CONFIG_BATTERY_DS2760 is not set
 CONFIG_BATTERY_GOLDFISH=y
 # CONFIG_BINARY_PRINTF is not set
 CONFIG_BITREVERSE=y
@@ -75,29 +74,13 @@ CONFIG_DUMMY_CONSOLE=y
 CONFIG_EARLYSUSPEND=y
 # CONFIG_FAULT_INJECTION is not set
 CONFIG_FB=y
-# CONFIG_FB_BACKLIGHT is not set
-# CONFIG_FB_BOOT_VESA_SUPPORT is not set
-# CONFIG_FB_BROADSHEET is not set
 CONFIG_FB_CFB_COPYAREA=y
 CONFIG_FB_CFB_FILLRECT=y
 CONFIG_FB_CFB_IMAGEBLIT=y
-# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
-# CONFIG_FB_DDC is not set
 CONFIG_FB_EARLYSUSPEND=y
-# CONFIG_FB_FOREIGN_ENDIAN is not set
 CONFIG_FB_GOLDFISH=y
-# CONFIG_FB_MACMODES is not set
-# CONFIG_FB_MB862XX is not set
-# CONFIG_FB_METRONOME is not set
 CONFIG_FB_MODE_HELPERS=y
-# CONFIG_FB_S1D13XXX is not set
-# CONFIG_FB_SVGALIB is not set
-# CONFIG_FB_SYS_COPYAREA is not set
-# CONFIG_FB_SYS_FILLRECT is not set
-# CONFIG_FB_SYS_FOPS is not set
-# CONFIG_FB_SYS_IMAGEBLIT is not set
 CONFIG_FB_TILEBLITTING=y
-# CONFIG_FB_VIRTUAL is not set
 # CONFIG_FIRMWARE_EDID is not set
 # CONFIG_FONTS is not set
 CONFIG_FONT_8x16=y
@@ -160,6 +143,7 @@ CONFIG_KEYBOARD_GOLDFISH_EVENTS=y
 # CONFIG_LOCK_STAT is not set
 # CONFIG_LOGO is not set
 CONFIG_MACH_GOLDFISH=y
+# CONFIG_MMC_GOLDFISH is not set
 # CONFIG_MTD_CFI is not set
 # CONFIG_MTD_COMPLEX_MAPPINGS is not set
 CONFIG_MTD_CONCAT=y
@@ -205,18 +189,6 @@ CONFIG_SUSPEND_FREEZER=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
 CONFIG_TICK_ONESHOT=y
 # CONFIG_TIMER_STATS is not set
-# CONFIG_TOUCHSCREEN_AD7879 is not set
-# CONFIG_TOUCHSCREEN_ELO is not set
-# CONFIG_TOUCHSCREEN_FUJITSU is not set
-# CONFIG_TOUCHSCREEN_GUNZE is not set
-# CONFIG_TOUCHSCREEN_INEXIO is not set
-# CONFIG_TOUCHSCREEN_MK712 is not set
-# CONFIG_TOUCHSCREEN_MTOUCH is not set
-# CONFIG_TOUCHSCREEN_PENMOUNT is not set
-# CONFIG_TOUCHSCREEN_TOUCHIT213 is not set
-# CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set
-# CONFIG_TOUCHSCREEN_TOUCHWIN is not set
-# CONFIG_TOUCHSCREEN_WACOM_W8001 is not set
 CONFIG_TRACING_SUPPORT=y
 # CONFIG_UBIFS_FS is not set
 CONFIG_UEVENT_HELPER_PATH=""