diff options
| author | Olof Johansson <olof@lixom.net> | 2013-09-10 22:17:54 -0400 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-09-10 22:17:54 -0400 |
| commit | 364e751787d5fed1f2ae0b72cbfb66b3aa1adb19 (patch) | |
| tree | a8a5f1fa83c5bcc0c85c6f076e6ceb5718854c2f /arch/arm/mach-ep93xx | |
| parent | 1e2c2390ef51fa4fcdb1082e8da11025ef329116 (diff) | |
| parent | cc3874fe56923e713427e4a3737c40746397347e (diff) | |
Merge tag 'ep93xx-fixes-for-3.12' of git://github.com/RyanMallon/linux-ep93xx into fixes
From Ryan Mallon, a fix for ep93xx.
* tag 'ep93xx-fixes-for-3.12' of git://github.com/RyanMallon/linux-ep93xx:
ARM: ep93xx: Don't use modem interface on the second UART
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-ep93xx')
| -rw-r--r-- | arch/arm/mach-ep93xx/core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-ep93xx/core.c b/arch/arm/mach-ep93xx/core.c index df8612fbbc9c..3f12b885c083 100644 --- a/arch/arm/mach-ep93xx/core.c +++ b/arch/arm/mach-ep93xx/core.c | |||
| @@ -281,7 +281,7 @@ static AMBA_APB_DEVICE(uart1, "apb:uart1", 0x00041010, EP93XX_UART1_PHYS_BASE, | |||
| 281 | { IRQ_EP93XX_UART1 }, &ep93xx_uart_data); | 281 | { IRQ_EP93XX_UART1 }, &ep93xx_uart_data); |
| 282 | 282 | ||
| 283 | static AMBA_APB_DEVICE(uart2, "apb:uart2", 0x00041010, EP93XX_UART2_PHYS_BASE, | 283 | static AMBA_APB_DEVICE(uart2, "apb:uart2", 0x00041010, EP93XX_UART2_PHYS_BASE, |
| 284 | { IRQ_EP93XX_UART2 }, &ep93xx_uart_data); | 284 | { IRQ_EP93XX_UART2 }, NULL); |
| 285 | 285 | ||
| 286 | static AMBA_APB_DEVICE(uart3, "apb:uart3", 0x00041010, EP93XX_UART3_PHYS_BASE, | 286 | static AMBA_APB_DEVICE(uart3, "apb:uart3", 0x00041010, EP93XX_UART3_PHYS_BASE, |
| 287 | { IRQ_EP93XX_UART3 }, &ep93xx_uart_data); | 287 | { IRQ_EP93XX_UART3 }, &ep93xx_uart_data); |