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-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
mach-s3c64xx
/
mach-smdk6410.c
diff --git
a/arch/arm/mach-s3c64xx/mach-smdk6410.c
b/arch/arm/mach-s3c64xx/mach-smdk6410.c
index ec8865c03a1965d0ae51c7f64251fd8e0a08beae..77488facfe4cab45ad9c8c9ea996e06138ec0074 100644
(file)
--- a/
arch/arm/mach-s3c64xx/mach-smdk6410.c
+++ b/
arch/arm/mach-s3c64xx/mach-smdk6410.c
@@
-283,6
+283,7
@@
static struct platform_device *smdk6410_devices[] __initdata = {
&s3c_device_fb,
&s3c_device_ohci,
&s3c_device_usb_hsotg,
+ &s3c_device_pcm,
&s3c64xx_device_iisv4,
&samsung_device_keypad,