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 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[pandora-kernel.git]
/
arch
/
arm
/
mach-s3c2410
/
mach-h1940.c
diff --git
a/arch/arm/mach-s3c2410/mach-h1940.c
b/arch/arm/mach-s3c2410/mach-h1940.c
index
d7ada8c
..
1a81fe1
100644
(file)
--- a/
arch/arm/mach-s3c2410/mach-h1940.c
+++ b/
arch/arm/mach-s3c2410/mach-h1940.c
@@
-387,7
+387,7
@@
static struct platform_device *h1940_devices[] __initdata = {
&s3c_device_wdt,
&s3c_device_i2c0,
&s3c_device_iis,
- &s
3c_device_pcm
,
+ &s
amsung_asoc_dma
,
&s3c_device_usbgadget,
&h1940_device_leds,
&h1940_device_bluetooth,