diff options
| author | Olof Johansson <olof@lixom.net> | 2012-09-29 21:01:47 (GMT) |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-09-29 21:01:47 (GMT) |
| commit | 9cf1c871526cf6bfec2a653e1e068ee72592542c (patch) | |
| tree | bfef78257c3cfc2d05708481be1c98072d46c26d /arch/arm/plat-omap | |
| parent | 268aebe4d04bf2ac1e839eff2c83519768460189 (diff) | |
| parent | cfc55bcc1f78395872d41c50f6a3129c4b42289e (diff) | |
| download | linux-9cf1c871526cf6bfec2a653e1e068ee72592542c.tar.xz | |
Merge tag 'omap-devel-board-late-v3-for-v3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/cleanup
From Tony Lindgren:
These board and platform related patches have been posted
quite a while ago but have somehow fallen though the cracks
as most of the focus has been making things to work with
device tree. As the first patch depends on sparse IRQ
related removal of irqs.h and related header moves, these
are based on omap-cleanup-local-headers-for-v3.7 tag.
* tag 'omap-devel-board-late-v3-for-v3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
ARM: OMAP2+: serial: Change MAX_HSUART_PORTS to 6
ARM: OMAP4: twl-common: Support for additional devices on i2c1 bus
Diffstat (limited to 'arch/arm/plat-omap')
| -rw-r--r-- | arch/arm/plat-omap/include/plat/omap-serial.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/plat-omap/include/plat/omap-serial.h b/arch/arm/plat-omap/include/plat/omap-serial.h index b2eac60..f4a4cd0 100644 --- a/arch/arm/plat-omap/include/plat/omap-serial.h +++ b/arch/arm/plat-omap/include/plat/omap-serial.h @@ -52,7 +52,7 @@ #define OMAP_UART_DMA_CH_FREE -1 -#define OMAP_MAX_HSUART_PORTS 4 +#define OMAP_MAX_HSUART_PORTS 6 #define MSR_SAVE_FLAGS UART_MSR_ANY_DELTA |