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/sage/ceph...
[pandora-kernel.git]
/
arch
/
arm
/
mach-s5p64x0
/
mach-smdk6440.c
diff --git
a/arch/arm/mach-s5p64x0/mach-smdk6440.c
b/arch/arm/mach-s5p64x0/mach-smdk6440.c
index
e980275
..
e5beb84
100644
(file)
--- a/
arch/arm/mach-s5p64x0/mach-smdk6440.c
+++ b/
arch/arm/mach-s5p64x0/mach-smdk6440.c
@@
-95,6
+95,7
@@
static struct platform_device *smdk6440_devices[] __initdata = {
&s3c_device_i2c1,
&s3c_device_ts,
&s3c_device_wdt,
+ &samsung_asoc_dma,
&s5p6440_device_iis,
};