Messages in this thread | | | Date | Fri, 29 Jun 2012 16:49:46 +1000 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the pwm tree with the s5p tree |
| |
Hi Thierry,
Today's linux-next merge of the pwm tree got a conflict in arch/arm/plat-samsung/Makefile between commit 65ab16fd385f ("ARM: EXYNOS: Remove leftovers of the Samsung specific power domain control") from the s5p tree and commit 2663e766c56a ("ARM Samsung: Move s3c pwm driver to pwm framework") from the pwm tree.
Just context changes. I fixed it up (see below) and can carry the fix as necessary. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/arm/plat-samsung/Makefile index 4bb58c2,9685472..0000000 --- a/arch/arm/plat-samsung/Makefile +++ b/arch/arm/plat-samsung/Makefile @@@ -59,7 -59,7 +59,3 @@@ obj-$(CONFIG_SAMSUNG_WAKEMASK) += wakeu obj-$(CONFIG_S5P_PM) += s5p-pm.o s5p-irq-pm.o obj-$(CONFIG_S5P_SLEEP) += s5p-sleep.o -- - # PWM support - obj-$(CONFIG_HAVE_PWM) += pwm.o -# PD support - -obj-$(CONFIG_SAMSUNG_PD) += pd.o [unhandled content-type:application/pgp-signature] | |