git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs
[pandora-kernel.git]
/
arch
/
arm
/
mach-s3c2410
/
mach-tct_hammer.c
diff --git
a/arch/arm/mach-s3c2410/mach-tct_hammer.c
b/arch/arm/mach-s3c2410/mach-tct_hammer.c
index
929164a
..
a15d062
100644
(file)
--- a/
arch/arm/mach-s3c2410/mach-tct_hammer.c
+++ b/
arch/arm/mach-s3c2410/mach-tct_hammer.c
@@
-152,8
+152,6
@@
static void __init tct_hammer_init(void)
}
MACHINE_START(TCT_HAMMER, "TCT_HAMMER")
}
MACHINE_START(TCT_HAMMER, "TCT_HAMMER")
- .phys_io = S3C2410_PA_UART,
- .io_pg_offst = (((u32)S3C24XX_VA_UART) >> 18) & 0xfffc,
.boot_params = S3C2410_SDRAM_PA + 0x100,
.map_io = tct_hammer_map_io,
.init_irq = s3c24xx_init_irq,
.boot_params = S3C2410_SDRAM_PA + 0x100,
.map_io = tct_hammer_map_io,
.init_irq = s3c24xx_init_irq,