Hi all,
Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/mach-omap2/board-3430sdp.c between commit 51482be9dcfd ("ARM:
OMAP: USB: Add phy binding information") from the usb tree and commit
77f86144984e ("ARM: OMAP: sdp3430: 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 [email protected] diff --cc arch/arm/mach-omap2/board-3430sdp.c index 2a739b2,4f17339..0000000 --- a/arch/arm/mach-omap2/board-3430sdp.c +++ b/arch/arm/mach-omap2/board-3430sdp.c @@@ -25,7 -25,7 +25,8 @@@ #include <linux/gpio.h> #include <linux/mmc/host.h> #include <linux/platform_data/spi-omap2-mcspi.h> + #include <linux/platform_data/omap-twl4030.h> +#include <linux/usb/phy.h> #include <asm/mach-types.h> #include <asm/mach/arch.h>
pgpRydvgn0hFc.pgp
Description: PGP signature
