diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-09-12 07:02:26 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-12 07:02:26 -0400 |
| commit | ddd559b13f6d2fe3ad68c4b3f5235fd3c2eae4e3 (patch) | |
| tree | d827bca3fc825a0ac33efbcd493713be40fcc812 /arch/arm/mach-mx2/devices.h | |
| parent | cf7a2b4fb6a9b86779930a0a123b0df41aa9208f (diff) | |
| parent | f17a1f06d2fa93f4825be572622eb02c4894db4e (diff) | |
Merge branch 'devel-stable' into devel
Conflicts:
MAINTAINERS
arch/arm/mm/fault.c
Diffstat (limited to 'arch/arm/mach-mx2/devices.h')
| -rw-r--r-- | arch/arm/mach-mx2/devices.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/arch/arm/mach-mx2/devices.h b/arch/arm/mach-mx2/devices.h index 049005bb6aa9..d315406d6725 100644 --- a/arch/arm/mach-mx2/devices.h +++ b/arch/arm/mach-mx2/devices.h | |||
| @@ -4,7 +4,6 @@ extern struct platform_device mxc_gpt3; | |||
| 4 | extern struct platform_device mxc_gpt4; | 4 | extern struct platform_device mxc_gpt4; |
| 5 | extern struct platform_device mxc_gpt5; | 5 | extern struct platform_device mxc_gpt5; |
| 6 | extern struct platform_device mxc_wdt; | 6 | extern struct platform_device mxc_wdt; |
| 7 | extern struct platform_device mxc_irda_device; | ||
| 8 | extern struct platform_device mxc_uart_device0; | 7 | extern struct platform_device mxc_uart_device0; |
| 9 | extern struct platform_device mxc_uart_device1; | 8 | extern struct platform_device mxc_uart_device1; |
| 10 | extern struct platform_device mxc_uart_device2; | 9 | extern struct platform_device mxc_uart_device2; |
| @@ -20,3 +19,11 @@ extern struct platform_device mxc_i2c_device0; | |||
| 20 | extern struct platform_device mxc_i2c_device1; | 19 | extern struct platform_device mxc_i2c_device1; |
| 21 | extern struct platform_device mxc_sdhc_device0; | 20 | extern struct platform_device mxc_sdhc_device0; |
| 22 | extern struct platform_device mxc_sdhc_device1; | 21 | extern struct platform_device mxc_sdhc_device1; |
| 22 | extern struct platform_device mxc_otg_udc_device; | ||
| 23 | extern struct platform_device mxc_otg_host; | ||
| 24 | extern struct platform_device mxc_usbh1; | ||
| 25 | extern struct platform_device mxc_usbh2; | ||
| 26 | extern struct platform_device mxc_spi_device0; | ||
| 27 | extern struct platform_device mxc_spi_device1; | ||
| 28 | extern struct platform_device mxc_spi_device2; | ||
| 29 | |||