git.samba.org
/
sfrench
/
cifs-2.6.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/tty-2.6
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
mach-s3c2416
/
mach-smdk2416.c
diff --git
a/arch/arm/mach-s3c2416/mach-smdk2416.c
b/arch/arm/mach-s3c2416/mach-smdk2416.c
index 5fc3f67ef265006d271d9a185d5fd6a9b5c09fbd..7fc366476d7e0e68522f8b47f8065d264840b9ed 100644
(file)
--- a/
arch/arm/mach-s3c2416/mach-smdk2416.c
+++ b/
arch/arm/mach-s3c2416/mach-smdk2416.c
@@
-195,8
+195,6
@@
static void __init smdk2416_machine_init(void)
MACHINE_START(SMDK2416, "SMDK2416")
/* Maintainer: Yauhen Kharuzhy <jekhor@gmail.com> */
- .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,