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-2.6.36' into for-2.6.37
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
mach-pxa
/
pxa3xx.c
diff --git
a/arch/arm/mach-pxa/pxa3xx.c
b/arch/arm/mach-pxa/pxa3xx.c
index fa0014847c71503f4f929870cce2622deb0abd9d..90974e6fae6a69458a91b4bc82f281baa5f3b003 100644
(file)
--- a/
arch/arm/mach-pxa/pxa3xx.c
+++ b/
arch/arm/mach-pxa/pxa3xx.c
@@
-610,6
+610,11
@@
static struct platform_device *devices[] __initdata = {
&pxa27x_device_udc,
&pxa_device_pmu,
&pxa_device_i2s,
+ &pxa_device_asoc_ssp1,
+ &pxa_device_asoc_ssp2,
+ &pxa_device_asoc_ssp3,
+ &pxa_device_asoc_ssp4,
+ &pxa_device_asoc_platform,
&sa1100_device_rtc,
&pxa_device_rtc,
&pxa27x_device_ssp1,