diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-10-03 06:52:33 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-10-03 06:52:33 -0400 |
| commit | 56f68556d7bbb51dd158c74deb09c783345bfbbd (patch) | |
| tree | 536e6e3c7063b1eee927194dda257602bd3dc66f /arch/arm/plat-omap/include/mach/serial.h | |
| parent | fd9470ce3ac6fb54d6026e4b1cdab0936e34805e (diff) | |
| parent | 7c8ad9828e793573877fd60868bb5d2f1e3b64da (diff) | |
Merge unstable branch 'omap-rmk'
Merge branch 'omap-rmk' into omap-all
Diffstat (limited to 'arch/arm/plat-omap/include/mach/serial.h')
| -rw-r--r-- | arch/arm/plat-omap/include/mach/serial.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/arm/plat-omap/include/mach/serial.h b/arch/arm/plat-omap/include/mach/serial.h index cc6bfa51ccb..515b89bee96 100644 --- a/arch/arm/plat-omap/include/mach/serial.h +++ b/arch/arm/plat-omap/include/mach/serial.h | |||
| @@ -26,12 +26,12 @@ | |||
| 26 | #define OMAP1510_BASE_BAUD (12000000/16) | 26 | #define OMAP1510_BASE_BAUD (12000000/16) |
| 27 | #define OMAP16XX_BASE_BAUD (48000000/16) | 27 | #define OMAP16XX_BASE_BAUD (48000000/16) |
| 28 | 28 | ||
| 29 | #define is_omap_port(p) ({int __ret = 0; \ | 29 | #define is_omap_port(pt) ({int __ret = 0; \ |
| 30 | if (p == IO_ADDRESS(OMAP_UART1_BASE) || \ | 30 | if ((pt)->port.mapbase == OMAP_UART1_BASE || \ |
| 31 | p == IO_ADDRESS(OMAP_UART2_BASE) || \ | 31 | (pt)->port.mapbase == OMAP_UART2_BASE || \ |
| 32 | p == IO_ADDRESS(OMAP_UART3_BASE)) \ | 32 | (pt)->port.mapbase == OMAP_UART3_BASE) \ |
| 33 | __ret = 1; \ | 33 | __ret = 1; \ |
| 34 | __ret; \ | 34 | __ret; \ |
| 35 | }) | 35 | }) |
| 36 | 36 | ||
| 37 | #endif | 37 | #endif |