lkml.org 
[lkml]   [2014]   [Mar]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
Subjectlinux-next: manual merge of the usb tree with the tip tree
Hi Greg,

Today's linux-next merge of the usb tree got a conflict in
arch/sh/Kconfig between commit fbfa893458ed ("sh: Remove Kconfig entries
for TMU, CMT and MTU2") from the tip tree and commit f6723b569a67 ("usb:
host: remove selects of USB_ARCH_HAS_?HCI") from the usb 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/sh/Kconfig
index dfb1fbf38e44,64455daa63a1..000000000000
--- a/arch/sh/Kconfig
+++ b/arch/sh/Kconfig
@@@ -346,9 -354,8 +346,8 @@@ config CPU_SUBTYPE_SH772
bool "Support SH7720 processor"
select CPU_SH3
select CPU_HAS_DSP
- select SYS_SUPPORTS_CMT
+ select SYS_SUPPORTS_SH_CMT
select ARCH_WANT_OPTIONAL_GPIOLIB
- select USB_ARCH_HAS_OHCI
select USB_OHCI_SH if USB_OHCI_HCD
select PINCTRL
help
@@@ -358,8 -365,7 +357,7 @@@ config CPU_SUBTYPE_SH772
bool "Support SH7721 processor"
select CPU_SH3
select CPU_HAS_DSP
- select SYS_SUPPORTS_CMT
+ select SYS_SUPPORTS_SH_CMT
- select USB_ARCH_HAS_OHCI
select USB_OHCI_SH if USB_OHCI_HCD
help
Select SH7721 if you have a SH3-DSP SH7721 CPU.
[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2014-03-17 09:21    [W:0.035 / U:0.008 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site