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 branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into devel-stable
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
mach-s5p6440
/
mach-smdk6440.c
diff --git
a/arch/arm/mach-s5p6440/mach-smdk6440.c
b/arch/arm/mach-s5p6440/mach-smdk6440.c
index 3ae88f2c7c77aede120669fffa0b39c033fa6095..d7fede971ca6cc5c65abd2951020571803284730 100644
(file)
--- a/
arch/arm/mach-s5p6440/mach-smdk6440.c
+++ b/
arch/arm/mach-s5p6440/mach-smdk6440.c
@@
-84,6
+84,7
@@
static struct s3c2410_uartcfg smdk6440_uartcfgs[] __initdata = {
};
static struct platform_device *smdk6440_devices[] __initdata = {
+ &s5p6440_device_iis,
};
static void __init smdk6440_map_io(void)