diff options
| author | Andy Green <andy.green@linaro.org> | 2011-05-31 09:24:56 +0100 |
|---|---|---|
| committer | Andy Green <andy.green@linaro.org> | 2011-05-31 11:06:25 +0100 |
| commit | 2b418b1380ee41f7f31cc4218c944a917c87c78e (patch) | |
| tree | dedb3eeacc561531cbbb616236b9f7a395568b18 /arch | |
| parent | 481c06f573f1751f0557bbe3d6e448418d117dc8 (diff) | |
uplevel config post 2.6.38.2
Signed-off-by: Andy Green <andy.green@linaro.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/configs/omap4_defconfig | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/arch/arm/configs/omap4_defconfig b/arch/arm/configs/omap4_defconfig index cc3b3d24195..b5fd464b218 100644 --- a/arch/arm/configs/omap4_defconfig +++ b/arch/arm/configs/omap4_defconfig @@ -32,7 +32,6 @@ CONFIG_ARCH_OMAP=y CONFIG_OMAP_SMARTREFLEX=y CONFIG_OMAP_SMARTREFLEX_CLASS3=y CONFIG_OMAP_MUX_DEBUG=y -CONFIG_OMAP_MBOX_FWK=y # CONFIG_ARCH_OMAP2 is not set CONFIG_ARM_THUMBEE=y CONFIG_NO_HZ=y @@ -123,7 +122,6 @@ CONFIG_BLK_DEV_LOOP=y CONFIG_BLK_DEV_RAM=y CONFIG_BLK_DEV_RAM_SIZE=16384 CONFIG_MISC_DEVICES=y -CONFIG_TI_ST=y CONFIG_SCSI=y CONFIG_BLK_DEV_SD=y CONFIG_SCSI_MULTI_LUN=y @@ -177,7 +175,6 @@ CONFIG_DEBUG_GPIO=y CONFIG_GPIO_SYSFS=y CONFIG_GPIO_TWL4030=y CONFIG_W1=y -# CONFIG_W1_CON is not set CONFIG_POWER_SUPPLY=y # CONFIG_HWMON is not set CONFIG_WATCHDOG=y @@ -197,16 +194,14 @@ CONFIG_VIDEO_DEV=y # CONFIG_MEDIA_TUNER_TEA5761 is not set CONFIG_VIDEO_OMAP2_VOUT=y CONFIG_RADIO_WL1273=m +CONFIG_RADIO_WL128X=y CONFIG_DRM=y -# CONFIG_DRM_OMAP is not set -CONFIG_FB=y CONFIG_FIRMWARE_EDID=y CONFIG_FB_MODE_HELPERS=y CONFIG_FB_TILEBLITTING=y CONFIG_OMAP2_VRAM_SIZE=32 CONFIG_OMAP2_DSS_DSI=y CONFIG_OMAP2_DSS_FAKE_VSYNC=y -CONFIG_FB_OMAP2=y CONFIG_PANEL_GENERIC_DPI=y CONFIG_PANEL_TAAL=y CONFIG_BACKLIGHT_LCD_SUPPORT=y @@ -214,7 +209,6 @@ CONFIG_LCD_CLASS_DEVICE=y CONFIG_LCD_PLATFORM=y CONFIG_DISPLAY_SUPPORT=y CONFIG_FRAMEBUFFER_CONSOLE=y -CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y CONFIG_FONTS=y CONFIG_FONT_8x8=y @@ -225,7 +219,6 @@ CONFIG_SOUND=y CONFIG_SND=y CONFIG_SND_MIXER_OSS=m CONFIG_SND_PCM_OSS=m -CONFIG_SND_DYNAMIC_MINORS=y CONFIG_SND_VERBOSE_PRINTK=y CONFIG_SND_DEBUG=y CONFIG_SND_DEBUG_VERBOSE=y |