diff options
| author | Cory Maccarrone <darkstar6262@gmail.com> | 2009-12-11 16:16:36 -0800 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2009-12-11 16:16:36 -0800 |
| commit | 87cbb94b8333c1ffcaf87c093b2613b69fe929c5 (patch) | |
| tree | 6765b0a81475945d6f61feca86bbc535fbf55d5a | |
| parent | 8d72c796c9d966b0efc26092dae7005c345b3efa (diff) | |
| download | linux-stable-87cbb94b8333c1ffcaf87c093b2613b69fe929c5.tar.gz linux-stable-87cbb94b8333c1ffcaf87c093b2613b69fe929c5.tar.bz2 linux-stable-87cbb94b8333c1ffcaf87c093b2613b69fe929c5.zip | |
omap1: htcherald: Update defconfig to include mux support
The existing htcherald_defconfig did not include mux support, which
prevented USB and other functionality from working out of the box.
This change updates the defconfig to add it in. It also aligns the
defconfig to the -rc8 kernel config.
Signed-off-by: Cory Maccarrone <darkstar6262@gmail.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
| -rw-r--r-- | arch/arm/configs/htcherald_defconfig | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/arch/arm/configs/htcherald_defconfig b/arch/arm/configs/htcherald_defconfig index 338267674075..1b39691b816f 100644 --- a/arch/arm/configs/htcherald_defconfig +++ b/arch/arm/configs/htcherald_defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.32-rc6 -# Sat Nov 14 10:56:01 2009 +# Linux kernel version: 2.6.32-rc8 +# Sat Dec 5 12:16:24 2009 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -198,7 +198,9 @@ CONFIG_ARCH_OMAP1=y # OMAP Feature Selections # # CONFIG_OMAP_RESET_CLOCKS is not set -# CONFIG_OMAP_MUX is not set +CONFIG_OMAP_MUX=y +# CONFIG_OMAP_MUX_DEBUG is not set +CONFIG_OMAP_MUX_WARNINGS=y CONFIG_OMAP_MCBSP=y # CONFIG_OMAP_MBOX_FWK is not set CONFIG_OMAP_MPU_TIMER=y @@ -207,6 +209,7 @@ CONFIG_OMAP_LL_DEBUG_UART1=y # CONFIG_OMAP_LL_DEBUG_UART2 is not set # CONFIG_OMAP_LL_DEBUG_UART3 is not set # CONFIG_OMAP_LL_DEBUG_NONE is not set +CONFIG_OMAP_SERIAL_WAKE=y # CONFIG_OMAP_PM_NONE is not set CONFIG_OMAP_PM_NOOP=y |