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 git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6
[pandora-kernel.git]
/
arch
/
arm
/
mach-s3c2412
/
mach-jive.c
diff --git
a/arch/arm/mach-s3c2412/mach-jive.c
b/arch/arm/mach-s3c2412/mach-jive.c
index
478f4b4
..
923e01b
100644
(file)
--- a/
arch/arm/mach-s3c2412/mach-jive.c
+++ b/
arch/arm/mach-s3c2412/mach-jive.c
@@
-675,8
+675,6
@@
static void __init jive_machine_init(void)
MACHINE_START(JIVE, "JIVE")
/* Maintainer: Ben Dooks <ben-linux@fluff.org> */
- .phys_io = S3C2410_PA_UART,
- .io_pg_offst = (((u32)S3C24XX_VA_UART) >> 18) & 0xfffc,
.boot_params = S3C2410_SDRAM_PA + 0x100,
.init_irq = s3c24xx_init_irq,