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 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
[pandora-kernel.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
77488fa
..
e85192a
100644
(file)
--- a/
arch/arm/mach-s3c64xx/mach-smdk6410.c
+++ b/
arch/arm/mach-s3c64xx/mach-smdk6410.c
@@
-283,7
+283,7
@@
static struct platform_device *smdk6410_devices[] __initdata = {
&s3c_device_fb,
&s3c_device_ohci,
&s3c_device_usb_hsotg,
&s3c_device_fb,
&s3c_device_ohci,
&s3c_device_usb_hsotg,
- &s
3c_device_pcm
,
+ &s
amsung_asoc_dma
,
&s3c64xx_device_iisv4,
&samsung_device_keypad,
&s3c64xx_device_iisv4,
&samsung_device_keypad,