diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-10-28 11:26:12 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-28 11:26:12 -0400 |
| commit | 7a9787e1eba95a166265e6a260cf30af04ef0a99 (patch) | |
| tree | e730a4565e0318140d2fbd2f0415d18a339d7336 /drivers/serial/s3c2410.c | |
| parent | 41b9eb264c8407655db57b60b4457fe1b2ec9977 (diff) | |
| parent | 0173a3265b228da319ceb9c1ec6a5682fd1b2d92 (diff) | |
Merge commit 'v2.6.28-rc2' into x86/pci-ioapic-boot-irq-quirks
Diffstat (limited to 'drivers/serial/s3c2410.c')
| -rw-r--r-- | drivers/serial/s3c2410.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/serial/s3c2410.c b/drivers/serial/s3c2410.c index c5f03f41686f..87c182ef71b8 100644 --- a/drivers/serial/s3c2410.c +++ b/drivers/serial/s3c2410.c | |||
| @@ -19,10 +19,10 @@ | |||
| 19 | #include <linux/serial.h> | 19 | #include <linux/serial.h> |
| 20 | 20 | ||
| 21 | #include <asm/irq.h> | 21 | #include <asm/irq.h> |
| 22 | #include <asm/hardware.h> | 22 | #include <mach/hardware.h> |
| 23 | 23 | ||
| 24 | #include <asm/plat-s3c/regs-serial.h> | 24 | #include <plat/regs-serial.h> |
| 25 | #include <asm/arch/regs-gpio.h> | 25 | #include <mach/regs-gpio.h> |
| 26 | 26 | ||
| 27 | #include "samsung.h" | 27 | #include "samsung.h" |
| 28 | 28 | ||