diff options
| author | Tony Lindgren <tony@atomide.com> | 2010-03-22 14:06:38 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2010-03-22 14:06:38 -0700 |
| commit | b3c7740a120c8a7775cb63b4d094466da5c01692 (patch) | |
| tree | 829761bf38b84630ca07b8fe7e34d4feaa7905dc /arch/arm/configs | |
| parent | 220bf991b0366cc50a94feede3d7341fa5710ee4 (diff) | |
| parent | e6e8ea63f5d745e5a3030eec1964d0429b93107d (diff) | |
Merge branch 'omap-fixes-for-tony' of git://dev.omapzoom.org/pub/scm/saaguirre/linux-omap-camera into omap-fixes-for-linus
Diffstat (limited to 'arch/arm/configs')
| -rw-r--r-- | arch/arm/configs/omap_zoom2_defconfig | 2 | ||||
| -rw-r--r-- | arch/arm/configs/omap_zoom3_defconfig | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/configs/omap_zoom2_defconfig b/arch/arm/configs/omap_zoom2_defconfig index f5c6e11cf18..881faea03d7 100644 --- a/arch/arm/configs/omap_zoom2_defconfig +++ b/arch/arm/configs/omap_zoom2_defconfig @@ -661,7 +661,7 @@ CONFIG_DEVKMEM=y CONFIG_SERIAL_8250=y CONFIG_SERIAL_8250_CONSOLE=y CONFIG_SERIAL_8250_NR_UARTS=32 -CONFIG_SERIAL_8250_RUNTIME_UARTS=4 +CONFIG_SERIAL_8250_RUNTIME_UARTS=1 CONFIG_SERIAL_8250_EXTENDED=y CONFIG_SERIAL_8250_MANY_PORTS=y CONFIG_SERIAL_8250_SHARE_IRQ=y diff --git a/arch/arm/configs/omap_zoom3_defconfig b/arch/arm/configs/omap_zoom3_defconfig index ea9a5012d33..5e55b550a40 100644 --- a/arch/arm/configs/omap_zoom3_defconfig +++ b/arch/arm/configs/omap_zoom3_defconfig @@ -680,7 +680,7 @@ CONFIG_DEVKMEM=y CONFIG_SERIAL_8250=y CONFIG_SERIAL_8250_CONSOLE=y CONFIG_SERIAL_8250_NR_UARTS=32 -CONFIG_SERIAL_8250_RUNTIME_UARTS=4 +CONFIG_SERIAL_8250_RUNTIME_UARTS=1 CONFIG_SERIAL_8250_EXTENDED=y CONFIG_SERIAL_8250_MANY_PORTS=y CONFIG_SERIAL_8250_SHARE_IRQ=y |