diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-12-18 17:15:48 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-12-18 17:15:48 -0500 |
| commit | 0bd5292f5883d24b9416ba32a2a137482d7f380b (patch) | |
| tree | 8bd6eeb95445d1372f5735bccc22e8e4417a2cf4 /drivers/serial | |
| parent | fdb0a1a67e131f07a308730c80d07e330211d2e0 (diff) | |
| parent | a2449091522990e9746a3f1420b9041d9669590c (diff) | |
Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into devel
Diffstat (limited to 'drivers/serial')
| -rw-r--r-- | drivers/serial/imx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/serial/imx.c b/drivers/serial/imx.c index 73dea88cceb3..a50954612b60 100644 --- a/drivers/serial/imx.c +++ b/drivers/serial/imx.c | |||
| @@ -191,7 +191,7 @@ | |||
| 191 | #define SERIAL_IMX_MAJOR 207 | 191 | #define SERIAL_IMX_MAJOR 207 |
| 192 | #define MINOR_START 16 | 192 | #define MINOR_START 16 |
| 193 | #define DEV_NAME "ttymxc" | 193 | #define DEV_NAME "ttymxc" |
| 194 | #define MAX_INTERNAL_IRQ MXC_MAX_INT_LINES | 194 | #define MAX_INTERNAL_IRQ MXC_INTERNAL_IRQS |
| 195 | #endif | 195 | #endif |
| 196 | 196 | ||
| 197 | /* | 197 | /* |