diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-03-08 15:21:04 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-03-08 15:21:04 -0500 |
| commit | 988addf82e4c03739375279de73929580a2d4a6a (patch) | |
| tree | 989ae1cd4e264bbad80c65f04480486246e7b9f3 /arch/arm/mach-mx2/devices.h | |
| parent | 004c1c7096659d352b83047a7593e91d8a30e3c5 (diff) | |
| parent | 25cf84cf377c0aae5dbcf937ea89bc7893db5176 (diff) | |
Merge branch 'origin' into devel-stable
Conflicts:
arch/arm/mach-mx2/devices.c
arch/arm/mach-mx2/devices.h
sound/soc/pxa/pxa-ssp.c
Diffstat (limited to 'arch/arm/mach-mx2/devices.h')
| -rw-r--r-- | arch/arm/mach-mx2/devices.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-mx2/devices.h b/arch/arm/mach-mx2/devices.h index f15df2aaae4d..84ed51380174 100644 --- a/arch/arm/mach-mx2/devices.h +++ b/arch/arm/mach-mx2/devices.h | |||
| @@ -37,5 +37,6 @@ extern struct platform_device mxc_spi_device1; | |||
| 37 | #ifdef CONFIG_MACH_MX27 | 37 | #ifdef CONFIG_MACH_MX27 |
| 38 | extern struct platform_device mxc_spi_device2; | 38 | extern struct platform_device mxc_spi_device2; |
| 39 | #endif | 39 | #endif |
| 40 | extern struct platform_device mx21_usbhc_device; | ||
| 40 | extern struct platform_device imx_ssi_device0; | 41 | extern struct platform_device imx_ssi_device0; |
| 41 | extern struct platform_device imx_ssi_device1; | 42 | extern struct platform_device imx_ssi_device1; |