diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2008-08-08 16:10:12 -0400 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2008-08-08 16:10:12 -0400 |
| commit | af7a535688a758d15f06a98833e6a143b29af9de (patch) | |
| tree | bac5ab210bbbbe276f0e44ed84194d7c8bb16aae /drivers/serial/s3c2400.c | |
| parent | 0c17e4ceedd35c78b1c7413dbd16279a350be6bc (diff) | |
| parent | c41107c2d4fd31924533f4dbc4c3428acc2b5894 (diff) | |
Merge http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm into for-rmk
Diffstat (limited to 'drivers/serial/s3c2400.c')
| -rw-r--r-- | drivers/serial/s3c2400.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/serial/s3c2400.c b/drivers/serial/s3c2400.c index a1102053e553..c8b4266ac35f 100644 --- a/drivers/serial/s3c2400.c +++ b/drivers/serial/s3c2400.c | |||
| @@ -17,10 +17,10 @@ | |||
| 17 | 17 | ||
| 18 | #include <asm/irq.h> | 18 | #include <asm/irq.h> |
| 19 | 19 | ||
| 20 | #include <asm/hardware.h> | 20 | #include <mach/hardware.h> |
| 21 | 21 | ||
| 22 | #include <asm/plat-s3c/regs-serial.h> | 22 | #include <asm/plat-s3c/regs-serial.h> |
| 23 | #include <asm/arch/regs-gpio.h> | 23 | #include <mach/regs-gpio.h> |
| 24 | 24 | ||
| 25 | #include "samsung.h" | 25 | #include "samsung.h" |
| 26 | 26 | ||