Messages in this thread | | | Date | Thu, 29 Aug 2013 17:50:12 +1000 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the arm-soc tree with the v4l-dvb tree |
| |
Hi all,
Today's linux-next merge of the arm-soc tree got a conflict in arch/arm/mach-shmobile/include/mach/r8a7779.h between commit 4714a0255eee ("[media] ARM: shmobile: r8a7779: add VIN support") from the v4l-dvb tree and commit fee529df76ff ("ARM: shmobile: r8a7779: cleanup registration of usb phy") from the arm-soc tree.
I fixed it up (see below) and can carry the fix as necessary (no action is required).
-- Cheers, Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/arm/mach-shmobile/include/mach/r8a7779.h index 6d2b641,f08d6ec..0000000 --- a/arch/arm/mach-shmobile/include/mach/r8a7779.h +++ b/arch/arm/mach-shmobile/include/mach/r8a7779.h @@@ -4,8 -4,6 +4,7 @@@ #include <linux/sh_clk.h> #include <linux/pm_domain.h> #include <linux/sh_eth.h> - #include <linux/platform_data/usb-rcar-phy.h> +#include <linux/platform_data/camera-rcar.h> struct platform_device; @@@ -35,9 -32,6 +33,8 @@@ extern void r8a7779_add_early_devices(v extern void r8a7779_add_standard_devices(void); extern void r8a7779_add_standard_devices_dt(void); extern void r8a7779_add_ether_device(struct sh_eth_plat_data *pdata); - extern void r8a7779_add_usb_phy_device(struct rcar_phy_platform_data *pdata); +extern void r8a7779_add_vin_device(int idx, + struct rcar_vin_platform_data *pdata); extern void r8a7779_init_late(void); extern void r8a7779_clock_init(void); extern void r8a7779_pinmux_init(void); [unhandled content-type:application/pgp-signature] | |