diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2013-03-05 23:22:00 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2013-03-05 23:22:00 +0100 |
| commit | f01c28794c80cd4ca1520c73305ba7b82a657802 (patch) | |
| tree | 4d6ce6fdca54a10baedf70ff5e84ef2d1146379d /arch/arm/configs | |
| parent | 4246a9c9682fcced5e5dd997614a3d4f606efe7a (diff) | |
| parent | b0ad0995e92fdf6b25056da76c906c51bb06d6a5 (diff) | |
| download | blackbird-op-linux-f01c28794c80cd4ca1520c73305ba7b82a657802.tar.gz blackbird-op-linux-f01c28794c80cd4ca1520c73305ba7b82a657802.zip | |
Merge tag 'omap-for-v3.9-rc1/fixes-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes
Fix few regressions, omap3 pm init with device tree, and some
issues with the legacy mux code.
* tag 'omap-for-v3.9-rc1/fixes-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
ARM: OMAP: RX-51: add missing USB phy binding
ARM: OMAP2+: Remove duplicate omap4430_init_late() declaration
ARM: OMAP2+: mux: correct wrong error messages
ARM: OMAP2+: mux: fix debugfs file permission
ARM: OMAP2+: Fix unmet direct dependencies for zoom for 8250 serial
ARM: OMAP3: board-generic: Add missing omap3_init_late
ARM: OMAP2+: Fix broken gpmc support
ARM: OMAP1: Fix build related to kgdb.h no longer including serial_8250.h
Diffstat (limited to 'arch/arm/configs')
| -rw-r--r-- | arch/arm/configs/omap2plus_defconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/configs/omap2plus_defconfig b/arch/arm/configs/omap2plus_defconfig index b16bae2c9a60..bd07864f14a0 100644 --- a/arch/arm/configs/omap2plus_defconfig +++ b/arch/arm/configs/omap2plus_defconfig @@ -126,6 +126,8 @@ CONFIG_INPUT_MISC=y CONFIG_INPUT_TWL4030_PWRBUTTON=y CONFIG_VT_HW_CONSOLE_BINDING=y # CONFIG_LEGACY_PTYS is not set +CONFIG_SERIAL_8250=y +CONFIG_SERIAL_8250_CONSOLE=y CONFIG_SERIAL_8250_NR_UARTS=32 CONFIG_SERIAL_8250_EXTENDED=y CONFIG_SERIAL_8250_MANY_PORTS=y |
