Messages in this thread | | | Date | Mon, 24 Mar 2014 16:35:18 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the pwm tree with the arm-soc tree |
| |
Hi Thierry,
Today's linux-next merge of the pwm tree got a conflict in arch/arm/mach-pxa/Kconfig between commit c7dc7d49fa8c ("ARM: pxa: select I2C_GPIO only if I2C is on") from the arm-soc tree and commit 557fe99d9d49 ("pwm: Remove obsolete HAVE_PWM Kconfig symbol") from the pwm tree.
I fixed it up (the former also remove the select of HAVE_PWM) 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] | |