diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-08-15 12:15:17 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-08-15 12:15:17 -0400 |
| commit | f3efbe582b5396d134024c03a5fa253f2a85d9a6 (patch) | |
| tree | e4e15b7567b82d24cb1e7327398286a2b88df04c /drivers/serial/imx.c | |
| parent | 05d3ed0a1fe3ea05ab9f3b8d32576a0bc2e19660 (diff) | |
| parent | b635acec48bcaa9183fcbf4e3955616b0d4119b5 (diff) | |
Merge branch 'linus' into x86/gart
Diffstat (limited to 'drivers/serial/imx.c')
| -rw-r--r-- | drivers/serial/imx.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/serial/imx.c b/drivers/serial/imx.c index e0da4dc7bbf6..6a29f9330a73 100644 --- a/drivers/serial/imx.c +++ b/drivers/serial/imx.c | |||
| @@ -44,8 +44,8 @@ | |||
| 44 | 44 | ||
| 45 | #include <asm/io.h> | 45 | #include <asm/io.h> |
| 46 | #include <asm/irq.h> | 46 | #include <asm/irq.h> |
| 47 | #include <asm/hardware.h> | 47 | #include <mach/hardware.h> |
| 48 | #include <asm/arch/imx-uart.h> | 48 | #include <mach/imx-uart.h> |
| 49 | 49 | ||
| 50 | /* Register definitions */ | 50 | /* Register definitions */ |
| 51 | #define URXD0 0x0 /* Receiver Register */ | 51 | #define URXD0 0x0 /* Receiver Register */ |