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 'fix/asoc' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
[pandora-kernel.git]
/
arch
/
arm
/
mach-pxa
/
pxa25x.c
diff --git
a/arch/arm/mach-pxa/pxa25x.c
b/arch/arm/mach-pxa/pxa25x.c
index
fbc5b77
..
b166b1d
100644
(file)
--- a/
arch/arm/mach-pxa/pxa25x.c
+++ b/
arch/arm/mach-pxa/pxa25x.c
@@
-347,6
+347,7
@@
static struct platform_device *pxa25x_devices[] __initdata = {
&pxa25x_device_assp,
&pxa25x_device_pwm0,
&pxa25x_device_pwm1,
+ &pxa_device_asoc_platform,
};
static struct sys_device pxa25x_sysdev[] = {