2dcf78c0ee
There are some more conflicts than detected by git, namely support for the newly added cpuimx machines needed to be converted to dynamic device registration. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Conflicts: arch/arm/mach-imx/Makefile arch/arm/mach-imx/devices.c arch/arm/mach-imx/devices.h arch/arm/mach-imx/eukrea_mbimx27-baseboard.c arch/arm/mach-mx2/Kconfig arch/arm/mach-mx25/Makefile arch/arm/mach-mx25/devices.c arch/arm/plat-mxc/include/mach/mx25.h arch/arm/plat-mxc/include/mach/mxc_nand.h
17 lines
730 B
C
17 lines
730 B
C
extern struct platform_device mxc_otg;
|
|
extern struct platform_device otg_udc_device;
|
|
extern struct platform_device mxc_usbh2;
|
|
extern struct platform_device mxc_pwm_device0;
|
|
extern struct platform_device mxc_pwm_device1;
|
|
extern struct platform_device mxc_pwm_device2;
|
|
extern struct platform_device mxc_pwm_device3;
|
|
extern struct platform_device mxc_keypad_device;
|
|
extern struct platform_device mx25_fec_device;
|
|
extern struct platform_device mx25_rtc_device;
|
|
extern struct platform_device mx25_fb_device;
|
|
extern struct platform_device mxc_wdt;
|
|
extern struct platform_device mx25_kpp_device;
|
|
extern struct platform_device imx_ssi_device0;
|
|
extern struct platform_device imx_ssi_device1;
|
|
extern struct platform_device mx25_csi_device;
|