diff options
| author | Len Brown <len.brown@intel.com> | 2005-08-23 22:12:23 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2005-08-23 22:12:23 -0400 |
| commit | 84ffa747520edd4556b136bdfc9df9eb1673ce12 (patch) | |
| tree | 1cfe20bd31fce1b5b3024384fcb324c3338d1d32 /arch/arm/mach-s3c2410/s3c2410.c | |
| parent | 702c7e7626deeabb057b6f529167b65ec2eefbdb (diff) | |
| parent | 81065e2f415af6c028eac13f481fb9e60a0b487b (diff) | |
Merge from-linus to-akpm
Diffstat (limited to 'arch/arm/mach-s3c2410/s3c2410.c')
| -rw-r--r-- | arch/arm/mach-s3c2410/s3c2410.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-s3c2410/s3c2410.c b/arch/arm/mach-s3c2410/s3c2410.c index ff2f25409e44..0b88993dfd27 100644 --- a/arch/arm/mach-s3c2410/s3c2410.c +++ b/arch/arm/mach-s3c2410/s3c2410.c | |||
| @@ -18,6 +18,7 @@ | |||
| 18 | * 28-Sep-2004 BJD Updates for new serial port bits | 18 | * 28-Sep-2004 BJD Updates for new serial port bits |
| 19 | * 04-Nov-2004 BJD Updated UART configuration process | 19 | * 04-Nov-2004 BJD Updated UART configuration process |
| 20 | * 10-Jan-2005 BJD Removed s3c2410_clock_tick_rate | 20 | * 10-Jan-2005 BJD Removed s3c2410_clock_tick_rate |
| 21 | * 13-Aug-2005 DA Removed UART from initial I/O mappings | ||
| 21 | */ | 22 | */ |
| 22 | 23 | ||
| 23 | #include <linux/kernel.h> | 24 | #include <linux/kernel.h> |
| @@ -49,10 +50,9 @@ static struct map_desc s3c2410_iodesc[] __initdata = { | |||
| 49 | IODESC_ENT(USBHOST), | 50 | IODESC_ENT(USBHOST), |
| 50 | IODESC_ENT(CLKPWR), | 51 | IODESC_ENT(CLKPWR), |
| 51 | IODESC_ENT(LCD), | 52 | IODESC_ENT(LCD), |
| 52 | IODESC_ENT(UART), | ||
| 53 | IODESC_ENT(TIMER), | 53 | IODESC_ENT(TIMER), |
| 54 | IODESC_ENT(ADC), | 54 | IODESC_ENT(ADC), |
| 55 | IODESC_ENT(WATCHDOG) | 55 | IODESC_ENT(WATCHDOG), |
| 56 | }; | 56 | }; |
| 57 | 57 | ||
| 58 | static struct resource s3c_uart0_resource[] = { | 58 | static struct resource s3c_uart0_resource[] = { |