diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-02-27 10:40:36 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-02-27 10:40:36 -0500 |
| commit | 78240e37963ac6f4483f6473c786c0f0ab7e78fe (patch) | |
| tree | dbb1a62ec2efe4bd14ce2a7f2d8abe76b812ccb3 /arch/arm/mach-pxa/pxa25x.c | |
| parent | 59a4f92a3612f3c3ea4c13b43e0e50ae66abfa7b (diff) | |
| parent | fa4704fee22df9c24297305288b53ba8aae527b4 (diff) | |
Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into fixes
Diffstat (limited to 'arch/arm/mach-pxa/pxa25x.c')
| -rw-r--r-- | arch/arm/mach-pxa/pxa25x.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-pxa/pxa25x.c b/arch/arm/mach-pxa/pxa25x.c index fbc5b775f895..b166b1d845d7 100644 --- 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 = { | |||
| 347 | &pxa25x_device_assp, | 347 | &pxa25x_device_assp, |
| 348 | &pxa25x_device_pwm0, | 348 | &pxa25x_device_pwm0, |
| 349 | &pxa25x_device_pwm1, | 349 | &pxa25x_device_pwm1, |
| 350 | &pxa_device_asoc_platform, | ||
| 350 | }; | 351 | }; |
| 351 | 352 | ||
| 352 | static struct sys_device pxa25x_sysdev[] = { | 353 | static struct sys_device pxa25x_sysdev[] = { |