[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <20101018170619.25f6566f.sfr@canb.auug.org.au>
Date: Mon, 18 Oct 2010 17:06:19 +1100
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Greg KH <greg@...ah.com>
Cc: linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
Anatolij Gustschin <agust@...x.de>,
David Daney <ddaney@...iumnetworks.com>,
Ralf Baechle <ralf@...ux-mips.org>
Subject: linux-next: manual merge of the usb tree with the mips tree
Hi Greg,
Today's linux-next merge of the usb tree got a conflict in
drivers/usb/host/Kconfig between commit
cd97084c3aff6f1037e00ee711a872719b60441d ("USB: Add EHCI and OHCH glue
for OCTEON II SOCs") from the mips tree and commit
c67a807cb13570bfc7b78f53158d14a433c59591 ("USB: add USB EHCI support for
MPC5121 SoC") from the usb tree.
I fixed it up (see below) and can carry the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@...b.auug.org.au
diff --cc drivers/usb/host/Kconfig
index a03d688,bf2e7d2..0000000
--- a/drivers/usb/host/Kconfig
+++ b/drivers/usb/host/Kconfig
@@@ -93,7 -93,8 +93,8 @@@ config USB_EHCI_TT_NEWSCHE
config USB_EHCI_BIG_ENDIAN_MMIO
bool
- depends on USB_EHCI_HCD && (PPC_CELLEB || PPC_PS3 || 440EPX || ARCH_IXP4XX || XPS_USB_HCD_XILINX || CPU_CAVIUM_OCTEON)
+ depends on USB_EHCI_HCD && (PPC_CELLEB || PPC_PS3 || 440EPX || ARCH_IXP4XX || \
- XPS_USB_HCD_XILINX || PPC_MPC512x)
++ XPS_USB_HCD_XILINX || PPC_MPC512x || CPU_CAVIUM_OCTEON)
default y
config USB_EHCI_BIG_ENDIAN_DESC
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists