Messages in this thread | | | Date | Wed, 19 Jun 2013 16:45:21 +1000 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the samsung tree with the usb tree |
| |
Hi Kukjin,
Today's linux-next merge of the samsung tree got a conflict in drivers/usb/Kconfig between commit d9ea21a77927 ("usb: host: make USB_ARCH_HAS_?HCI obsolete") from the usb tree and commit 58d5b72088cc ("USB: Check for ARCH_EXYNOS separately") from the samsung tree.
I fixed it up (USB_ARCH_HAS_EHCI is no longer used) and can carry the fix as necessary (no action is required).
-- Cheers, Stephen Rothwell sfr@canb.auug.org.au [unhandled content-type:application/pgp-signature] | |