projects
/
linux-drm-fsl-dcu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'core-locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[linux-drm-fsl-dcu.git]
/
arch
/
arm
/
mach-s3c24xx
/
mach-jive.c
diff --git
a/arch/arm/mach-s3c24xx/mach-jive.c
b/arch/arm/mach-s3c24xx/mach-jive.c
index a45fcd8ccf796016c9007d0d7a44e089f30a9497..43c23e220f5b5823eb0831fe68f52430fb06f475 100644
(file)
--- a/
arch/arm/mach-s3c24xx/mach-jive.c
+++ b/
arch/arm/mach-s3c24xx/mach-jive.c
@@
-466,6
+466,7
@@
static struct platform_device *jive_devices[] __initdata = {
&jive_device_wm8750,
&s3c_device_nand,
&s3c_device_usbgadget,
+ &s3c2412_device_dma,
};
static struct s3c2410_udc_mach_info jive_udc_cfg __initdata = {