e4862f2f6f
Fairly simple conflicts, the most serious ones are the i.MX ones which I suspect now need another rename. Conflicts: arch/arm/mach-mx2/clock_imx27.c arch/arm/mach-mx2/devices.c arch/arm/mach-omap2/board-rx51-peripherals.c arch/arm/mach-omap2/board-zoom2.c sound/soc/fsl/mpc5200_dma.c sound/soc/fsl/mpc5200_dma.h sound/soc/fsl/mpc8610_hpcd.c sound/soc/pxa/spitz.c
48 lines
2.0 KiB
C
48 lines
2.0 KiB
C
extern struct platform_device pxa_device_pmu;
|
|
extern struct platform_device pxa_device_mci;
|
|
extern struct platform_device pxa3xx_device_mci2;
|
|
extern struct platform_device pxa3xx_device_mci3;
|
|
extern struct platform_device pxa25x_device_udc;
|
|
extern struct platform_device pxa27x_device_udc;
|
|
extern struct platform_device pxa_device_fb;
|
|
extern struct platform_device pxa_device_ffuart;
|
|
extern struct platform_device pxa_device_btuart;
|
|
extern struct platform_device pxa_device_stuart;
|
|
extern struct platform_device pxa_device_hwuart;
|
|
extern struct platform_device pxa_device_i2c;
|
|
extern struct platform_device pxa_device_i2s;
|
|
extern struct platform_device pxa_device_ficp;
|
|
extern struct platform_device sa1100_device_rtc;
|
|
extern struct platform_device pxa_device_rtc;
|
|
extern struct platform_device pxa_device_ac97;
|
|
|
|
extern struct platform_device pxa27x_device_i2c_power;
|
|
extern struct platform_device pxa27x_device_ohci;
|
|
extern struct platform_device pxa27x_device_keypad;
|
|
|
|
extern struct platform_device pxa25x_device_ssp;
|
|
extern struct platform_device pxa25x_device_nssp;
|
|
extern struct platform_device pxa25x_device_assp;
|
|
extern struct platform_device pxa27x_device_ssp1;
|
|
extern struct platform_device pxa27x_device_ssp2;
|
|
extern struct platform_device pxa27x_device_ssp3;
|
|
extern struct platform_device pxa3xx_device_ssp4;
|
|
|
|
extern struct platform_device pxa25x_device_pwm0;
|
|
extern struct platform_device pxa25x_device_pwm1;
|
|
extern struct platform_device pxa27x_device_pwm0;
|
|
extern struct platform_device pxa27x_device_pwm1;
|
|
|
|
extern struct platform_device pxa3xx_device_nand;
|
|
extern struct platform_device pxa3xx_device_i2c_power;
|
|
|
|
extern struct platform_device pxa3xx_device_gcu;
|
|
|
|
extern struct platform_device pxa_device_asoc_platform;
|
|
extern struct platform_device pxa_device_asoc_ssp1;
|
|
extern struct platform_device pxa_device_asoc_ssp2;
|
|
extern struct platform_device pxa_device_asoc_ssp3;
|
|
extern struct platform_device pxa_device_asoc_ssp4;
|
|
|
|
void __init pxa_register_device(struct platform_device *dev, void *data);
|