* linux-next: manual merge of the usb tree with the sh tree
@ 2010-12-06 1:47 Stephen Rothwell
2010-12-07 4:43 ` Greg KH
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2010-12-06 1:47 UTC (permalink / raw)
To: Greg KH; +Cc: linux-next, linux-kernel, Paul Mundt
Hi Greg,
Today's linux-next merge of the usb tree got a conflict in
arch/sh/Kconfig between commit f020c92de48246510623162fb22d60d91810cc56
("sh: Enable optional gpiolib for all CPUs with pinmux tables") from the
sh tree and commit e3e9887ee9de36d8e2bef972ad74a42abd7a44c4 ("sh: Convert
to USB_ARCH_HAS_OHCI/EHCI selects") from the usb tree.
Just context changes. I fixed ti up (see below) and can carry the fix as
necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/sh/Kconfig
index 90cd621,e0e2234..0000000
--- a/arch/sh/Kconfig
+++ b/arch/sh/Kconfig
@@@ -347,7 -344,7 +347,8 @@@ config CPU_SUBTYPE_SH772
select CPU_SH3
select CPU_HAS_DSP
select SYS_SUPPORTS_CMT
+ select ARCH_WANT_OPTIONAL_GPIOLIB
+ select USB_ARCH_HAS_OHCI
help
Select SH7720 if you have a SH3-DSP SH7720 CPU.
@@@ -461,7 -456,8 +464,9 @@@ config CPU_SUBTYPE_SH778
select CPU_SHX3
select CPU_HAS_PTEAEX
select GENERIC_CLOCKEVENTS_BROADCAST if SMP
+ select ARCH_WANT_OPTIONAL_GPIOLIB
+ select USB_ARCH_HAS_OHCI
+ select USB_ARCH_HAS_EHCI
config CPU_SUBTYPE_SHX3
bool "Support SH-X3 processor"
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: linux-next: manual merge of the usb tree with the sh tree
2010-12-06 1:47 linux-next: manual merge of the usb tree with the sh tree Stephen Rothwell
@ 2010-12-07 4:43 ` Greg KH
0 siblings, 0 replies; 2+ messages in thread
From: Greg KH @ 2010-12-07 4:43 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Paul Mundt
On Mon, Dec 06, 2010 at 12:47:23PM +1100, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the usb tree got a conflict in
> arch/sh/Kconfig between commit f020c92de48246510623162fb22d60d91810cc56
> ("sh: Enable optional gpiolib for all CPUs with pinmux tables") from the
> sh tree and commit e3e9887ee9de36d8e2bef972ad74a42abd7a44c4 ("sh: Convert
> to USB_ARCH_HAS_OHCI/EHCI selects") from the usb tree.
>
> Just context changes. I fixed ti up (see below) and can carry the fix as
> necessary.
Looks good, thanks for carrying this.
greg k-h
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-12-07 4:43 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-12-06 1:47 linux-next: manual merge of the usb tree with the sh tree Stephen Rothwell
2010-12-07 4:43 ` Greg KH
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox