Messages in this thread | | | Date | Mon, 11 Feb 2013 17:05:53 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the arm-soc tree with the usb tree |
| |
Hi all,
Today's linux-next merge of the arm-soc tree got a conflict in arch/arm/mach-omap2/board-zoom-peripherals.c between commit 51482be9dcfd ("ARM: OMAP: USB: Add phy binding information") from the usb tree and commit c5913935657f ("ARM: OMAP: zoom: Audio support via the common omap-twl4030 machine driver") 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-omap2/board-zoom-peripherals.c index dc5498b,0745bd9..0000000 --- a/arch/arm/mach-omap2/board-zoom-peripherals.c +++ b/arch/arm/mach-omap2/board-zoom-peripherals.c @@@ -20,7 -20,7 +20,8 @@@ #include <linux/wl12xx.h> #include <linux/mmc/host.h> #include <linux/platform_data/gpio-omap.h> + #include <linux/platform_data/omap-twl4030.h> +#include <linux/usb/phy.h> #include <asm/mach-types.h> #include <asm/mach/arch.h> [unhandled content-type:application/pgp-signature] | |