linux-next: manual merge of the tegra tree with the usb tree

From: Stephen Rothwell
Date: Wed Sep 12 2012 - 02:38:11 EST

Hi all,

Today's linux-next merge of the tegra tree got a conflict in
drivers/usb/phy/tegra_usb_phy.c between commit 1ba8216f0bc0 ("usb: move
phy driver from mach-tegra to drivers/usb") from the usb tree and commit
b0e51927b1e5 ("ARM: tegra: remove useless includes of <mach/*.h>") from
the tegra tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

Stephen Rothwell sfr@xxxxxxxxxxxxxxxx

diff --cc drivers/usb/phy/tegra_usb_phy.c
index 4739903,34ffebb..0000000
--- a/drivers/usb/phy/tegra_usb_phy.c
+++ b/drivers/usb/phy/tegra_usb_phy.c
@@@ -28,8 -30,7 +28,7 @@@
#include <linux/usb/otg.h>
#include <linux/usb/ulpi.h>
#include <asm/mach-types.h>
- #include <mach/gpio-tegra.h>
-#include <mach/usb_phy.h>
+#include <linux/usb/tegra_usb_phy.h>
#include <mach/iomap.h>

#define ULPI_VIEWPORT 0x170

Attachment: pgp00000.pgp
Description: PGP signature