diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-12-18 23:15:48 +0100 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-12-18 23:15:48 +0100 |
commit | 0bd5292f5883d24b9416ba32a2a137482d7f380b (patch) | |
tree | 8bd6eeb95445d1372f5735bccc22e8e4417a2cf4 /drivers/serial | |
parent | Merge branch 'next-merged' of git://aeryn.fluff.org.uk/bjdooks/linux into devel (diff) | |
parent | [ARM] MXC: do not include mach/hardware.h from mach/memory.h (diff) | |
download | linux-0bd5292f5883d24b9416ba32a2a137482d7f380b.tar.xz linux-0bd5292f5883d24b9416ba32a2a137482d7f380b.zip |
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 @@ #define SERIAL_IMX_MAJOR 207 #define MINOR_START 16 #define DEV_NAME "ttymxc" -#define MAX_INTERNAL_IRQ MXC_MAX_INT_LINES +#define MAX_INTERNAL_IRQ MXC_INTERNAL_IRQS #endif /* |