summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorDimitry Andric <dimitry@andric.com>2005-08-17 13:01:19 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2005-08-17 13:01:19 +0100
commit62ee914ef27fded9d1c5da41e1e05c3bd175c529 (patch)
tree558a72af9ff5015c859f0630650871bdc141b9cd /arch
parent22d8be866ee23bf3ad9fe867587eef5f4200bf84 (diff)
downloadlinux-3.10-62ee914ef27fded9d1c5da41e1e05c3bd175c529.tar.gz
linux-3.10-62ee914ef27fded9d1c5da41e1e05c3bd175c529.tar.bz2
linux-3.10-62ee914ef27fded9d1c5da41e1e05c3bd175c529.zip
[ARM] 2850/1: Remove duplicate UART I/O mapping from s3c2410_iodesc
Patch from Dimitry Andric This patch removes the initial UART I/O mapping from s3c2410_iodesc, since the same mapping is already done in the function s3c24xx_init_io in the file arch/arm/mach-s3c2410/cpu.c, through the s3c_iodesc array. I'm not sure if duplicate mappings do any harm, but it's simply redundant. Also, in s3c2440.c the UART I/O mapping is NOT done. Additionally, I put a comma behind the last mapping, to ease copy/pasting stuff around, and make the style consistent with s3c2440.c and other files. Signed-off-by: Dimitry Andric <dimitry@andric.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-s3c2410/s3c2410.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-s3c2410/s3c2410.c b/arch/arm/mach-s3c2410/s3c2410.c
index ff2f25409e4..0b88993dfd2 100644
--- a/arch/arm/mach-s3c2410/s3c2410.c
+++ b/arch/arm/mach-s3c2410/s3c2410.c
@@ -18,6 +18,7 @@
* 28-Sep-2004 BJD Updates for new serial port bits
* 04-Nov-2004 BJD Updated UART configuration process
* 10-Jan-2005 BJD Removed s3c2410_clock_tick_rate
+ * 13-Aug-2005 DA Removed UART from initial I/O mappings
*/
#include <linux/kernel.h>
@@ -49,10 +50,9 @@ static struct map_desc s3c2410_iodesc[] __initdata = {
IODESC_ENT(USBHOST),
IODESC_ENT(CLKPWR),
IODESC_ENT(LCD),
- IODESC_ENT(UART),
IODESC_ENT(TIMER),
IODESC_ENT(ADC),
- IODESC_ENT(WATCHDOG)
+ IODESC_ENT(WATCHDOG),
};
static struct resource s3c_uart0_resource[] = {