diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-06-14 06:00:16 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-06-14 06:00:16 -0400 |
| commit | 4c31791c3d9d38ac052dd5e2981df713d8f3dcc4 (patch) | |
| tree | b7f95922b2f1da5b36d95176e6d8f826151f3ee1 /arch/arm/mach-pxa/pxa3xx.c | |
| parent | 98797a241e28b787b84d308b867ec4c5fe7bbdf8 (diff) | |
| parent | 7517b3fbe40c231d79d36f31c1e9930cbb8c4be2 (diff) | |
Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel
Diffstat (limited to 'arch/arm/mach-pxa/pxa3xx.c')
| -rw-r--r-- | arch/arm/mach-pxa/pxa3xx.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-pxa/pxa3xx.c b/arch/arm/mach-pxa/pxa3xx.c index b02d4544dc95..6f678d93bf4e 100644 --- a/arch/arm/mach-pxa/pxa3xx.c +++ b/arch/arm/mach-pxa/pxa3xx.c | |||
| @@ -30,7 +30,7 @@ | |||
| 30 | #include <mach/pm.h> | 30 | #include <mach/pm.h> |
| 31 | #include <mach/dma.h> | 31 | #include <mach/dma.h> |
| 32 | #include <mach/ssp.h> | 32 | #include <mach/ssp.h> |
| 33 | #include <mach/i2c.h> | 33 | #include <plat/i2c.h> |
| 34 | 34 | ||
| 35 | #include "generic.h" | 35 | #include "generic.h" |
| 36 | #include "devices.h" | 36 | #include "devices.h" |
| @@ -552,7 +552,7 @@ void __init pxa3xx_set_i2c_power_info(struct i2c_pxa_platform_data *info) | |||
| 552 | } | 552 | } |
| 553 | 553 | ||
| 554 | static struct platform_device *devices[] __initdata = { | 554 | static struct platform_device *devices[] __initdata = { |
| 555 | /* &pxa_device_udc, The UDC driver is PXA25x only */ | 555 | &pxa27x_device_udc, |
| 556 | &pxa_device_ffuart, | 556 | &pxa_device_ffuart, |
| 557 | &pxa_device_btuart, | 557 | &pxa_device_btuart, |
| 558 | &pxa_device_stuart, | 558 | &pxa_device_stuart, |