diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-01-06 17:33:32 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-01-06 17:33:32 -0500 |
| commit | 404a02cbd2ae8bf256a2fa1169bdfe86bb5ebb34 (patch) | |
| tree | 99119edc53fdca73ed7586829b8ee736e09440b3 /arch/arm/mach-mx3/devices.h | |
| parent | 28cdac6690cb113856293bf79b40de33dbd8f974 (diff) | |
| parent | 1051b9f0f9eab8091fe3bf98320741adf36b4cfa (diff) | |
Merge branch 'devel-stable' into devel
Conflicts:
arch/arm/mach-pxa/clock.c
arch/arm/mach-pxa/clock.h
Diffstat (limited to 'arch/arm/mach-mx3/devices.h')
| -rw-r--r-- | arch/arm/mach-mx3/devices.h | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/arch/arm/mach-mx3/devices.h b/arch/arm/mach-mx3/devices.h index 585f814473d5..121962c568d1 100644 --- a/arch/arm/mach-mx3/devices.h +++ b/arch/arm/mach-mx3/devices.h | |||
| @@ -1,14 +1,4 @@ | |||
| 1 | extern struct platform_device mxc_w1_master_device; | ||
| 2 | extern struct platform_device mx3_ipu; | 1 | extern struct platform_device mx3_ipu; |
| 3 | extern struct platform_device mx3_fb; | 2 | extern struct platform_device mx3_fb; |
| 4 | extern struct platform_device mx3_camera; | 3 | extern struct platform_device mx3_camera; |
| 5 | extern struct platform_device mxcsdhc_device0; | ||
| 6 | extern struct platform_device mxcsdhc_device1; | ||
| 7 | extern struct platform_device mxc_otg_udc_device; | ||
| 8 | extern struct platform_device mxc_otg_host; | ||
| 9 | extern struct platform_device mxc_usbh1; | ||
| 10 | extern struct platform_device mxc_usbh2; | ||
| 11 | extern struct platform_device mxc_rnga_device; | ||
| 12 | extern struct platform_device imx_wdt_device0; | ||
| 13 | extern struct platform_device imx_rtc_device0; | 4 | extern struct platform_device imx_rtc_device0; |
| 14 | extern struct platform_device imx_kpp_device; | ||