mirror of
https://github.com/torvalds/linux.git
synced 2024-12-17 08:31:39 +00:00
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
33 lines
1.2 KiB
C
33 lines
1.2 KiB
C
#ifdef CONFIG_ARCH_MX1
|
|
extern struct platform_device imx1_camera_device;
|
|
extern struct platform_device imx_rtc_device;
|
|
extern struct platform_device imx_wdt_device;
|
|
extern struct platform_device imx_usb_device;
|
|
#endif
|
|
|
|
#if defined(CONFIG_MACH_MX21) || defined(CONFIG_MACH_MX27)
|
|
extern struct platform_device mxc_gpt1;
|
|
extern struct platform_device mxc_gpt2;
|
|
#ifdef CONFIG_MACH_MX27
|
|
extern struct platform_device mxc_gpt3;
|
|
extern struct platform_device mxc_gpt4;
|
|
extern struct platform_device mxc_gpt5;
|
|
#endif
|
|
extern struct platform_device mxc_wdt;
|
|
extern struct platform_device mxc_w1_master_device;
|
|
extern struct platform_device mxc_fb_device;
|
|
extern struct platform_device mxc_fec_device;
|
|
extern struct platform_device mxc_pwm_device;
|
|
extern struct platform_device mxc_sdhc_device0;
|
|
extern struct platform_device mxc_sdhc_device1;
|
|
extern struct platform_device mxc_otg_udc_device;
|
|
extern struct platform_device mx27_camera_device;
|
|
extern struct platform_device mxc_otg_host;
|
|
extern struct platform_device mxc_usbh1;
|
|
extern struct platform_device mxc_usbh2;
|
|
extern struct platform_device mx21_usbhc_device;
|
|
extern struct platform_device imx_ssi_device0;
|
|
extern struct platform_device imx_ssi_device1;
|
|
extern struct platform_device imx_kpp_device;
|
|
#endif
|