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-s3c2440
/
mach-rx1950.c
diff --git
a/arch/arm/mach-s3c2440/mach-rx1950.c
b/arch/arm/mach-s3c2440/mach-rx1950.c
index
e0622bb
..
eab6ae5
100644
(file)
--- a/
arch/arm/mach-s3c2440/mach-rx1950.c
+++ b/
arch/arm/mach-s3c2440/mach-rx1950.c
@@
-692,7
+692,7
@@
static struct platform_device *rx1950_devices[] __initdata = {
&s3c_device_wdt,
&s3c_device_i2c0,
&s3c_device_iis,
- &s
3c_device_pcm
,
+ &s
amsung_asoc_dma
,
&s3c_device_usbgadget,
&s3c_device_rtc,
&s3c_device_nand,