* linux-next: manual merge of the pwm tree with the usb tree
@ 2014-02-27 4:56 Stephen Rothwell
2014-02-27 12:10 ` Thierry Reding
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2014-02-27 4:56 UTC (permalink / raw)
To: Thierry Reding, Greg KH
Cc: linux-next, linux-kernel, Sascha Hauer, Paul Bolle
[-- Attachment #1: Type: text/plain, Size: 827 bytes --]
Hi Thierry,
Today's linux-next merge of the pwm tree got a conflict in
arch/arm/Kconfig between commit f6723b569a67 ("usb: host: remove selects
of USB_ARCH_HAS_?HCI") from the usb tree and commit 557fe99d9d49 ("pwm:
Remove obsolete HAVE_PWM Kconfig symbol") from the pwm 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/arm/Kconfig
index c85745d2d20a,cc6ce44064a2..000000000000
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -628,7 -629,7 +625,6 @@@ config ARCH_LPC32X
select CPU_ARM926T
select GENERIC_CLOCKEVENTS
select HAVE_IDE
- select HAVE_PWM
- select USB_ARCH_HAS_OHCI
select USE_OF
help
Support for the NXP LPC32XX family of processors
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: linux-next: manual merge of the pwm tree with the usb tree
2014-02-27 4:56 linux-next: manual merge of the pwm tree with the usb tree Stephen Rothwell
@ 2014-02-27 12:10 ` Thierry Reding
0 siblings, 0 replies; 2+ messages in thread
From: Thierry Reding @ 2014-02-27 12:10 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Greg KH, linux-next, linux-kernel, Sascha Hauer, Paul Bolle
[-- Attachment #1: Type: text/plain, Size: 989 bytes --]
On Thu, Feb 27, 2014 at 03:56:13PM +1100, Stephen Rothwell wrote:
> Hi Thierry,
>
> Today's linux-next merge of the pwm tree got a conflict in
> arch/arm/Kconfig between commit f6723b569a67 ("usb: host: remove selects
> of USB_ARCH_HAS_?HCI") from the usb tree and commit 557fe99d9d49 ("pwm:
> Remove obsolete HAVE_PWM Kconfig symbol") from the pwm 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/arm/Kconfig
> index c85745d2d20a,cc6ce44064a2..000000000000
> --- a/arch/arm/Kconfig
> +++ b/arch/arm/Kconfig
> @@@ -628,7 -629,7 +625,6 @@@ config ARCH_LPC32X
> select CPU_ARM926T
> select GENERIC_CLOCKEVENTS
> select HAVE_IDE
> - select HAVE_PWM
> - select USB_ARCH_HAS_OHCI
> select USE_OF
> help
> Support for the NXP LPC32XX family of processors
Looks good to me.
Thanks,
Thierry
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-02-27 12:10 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-02-27 4:56 linux-next: manual merge of the pwm tree with the usb tree Stephen Rothwell
2014-02-27 12:10 ` Thierry Reding
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).