lkml.org 
[lkml]   [2014]   [Feb]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: linux-next: manual merge of the pwm tree with the usb tree
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
[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2014-02-27 14:01    [W:0.048 / U:0.736 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site