diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-12-02 17:07:40 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-12-02 17:07:40 -0500 |
| commit | c5b84b3bb0c055d70dc9f1b5e900378bc9d059ea (patch) | |
| tree | bd5b0b4efb552bacd812f9e6e08a29bae70c0da1 /drivers/serial | |
| parent | d281bc9d8a22419abc254f86a7fc268bb99914e1 (diff) | |
| parent | bc2fd1c09c226ea47ab8301cde6dbcf9e5c78b73 (diff) | |
Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel
Conflicts:
arch/arm/mach-pxa/pxa25x.c
Diffstat (limited to 'drivers/serial')
| -rw-r--r-- | drivers/serial/pxa.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/serial/pxa.c b/drivers/serial/pxa.c index 8ea314bc00c1..f6e3b86bb0be 100644 --- a/drivers/serial/pxa.c +++ b/drivers/serial/pxa.c | |||
| @@ -48,6 +48,7 @@ | |||
| 48 | #include <mach/hardware.h> | 48 | #include <mach/hardware.h> |
| 49 | #include <asm/irq.h> | 49 | #include <asm/irq.h> |
| 50 | #include <mach/pxa-regs.h> | 50 | #include <mach/pxa-regs.h> |
| 51 | #include <mach/regs-uart.h> | ||
| 51 | 52 | ||
| 52 | 53 | ||
| 53 | struct uart_pxa_port { | 54 | struct uart_pxa_port { |