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://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
[pandora-kernel.git]
/
arch
/
arm
/
mach-s5pv310
/
mach-smdkc210.c
diff --git
a/arch/arm/mach-s5pv310/mach-smdkc210.c
b/arch/arm/mach-s5pv310/mach-smdkc210.c
index
2d49273
..
d9cab02
100644
(file)
--- a/
arch/arm/mach-s5pv310/mach-smdkc210.c
+++ b/
arch/arm/mach-s5pv310/mach-smdkc210.c
@@
-163,8
+163,9
@@
static struct platform_device *smdkc210_devices[] __initdata = {
&s5pv310_device_pd[PD_CAM],
&s5pv310_device_pd[PD_TV],
&s5pv310_device_pd[PD_GPS],
&s5pv310_device_pd[PD_CAM],
&s5pv310_device_pd[PD_TV],
&s5pv310_device_pd[PD_GPS],
- &smdkc210_smsc911x,
&s5pv310_device_sysmmu,
&s5pv310_device_sysmmu,
+ &samsung_asoc_dma,
+ &smdkc210_smsc911x,
};
static void __init smdkc210_smsc911x_init(void)
};
static void __init smdkc210_smsc911x_init(void)