Messages in this thread | | | Date | Wed, 12 Oct 2011 16:30:22 +1100 | From | Stephen Rothwell <> | Subject | Re: linux-next: manual merge of the staging tree with the pm tree |
| |
Hi Greg,
On Wed, 12 Oct 2011 16:28:05 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote: > > Today's linux-next merge of the staging tree got a conflict in > drivers/Kconfig between commit a3c98b8b2ede ("PM: Introduce devfreq: > generic DVFS framework with device-specific OPPs") from the pm tree and > commit 46a971913611 ("Staging: hv: move hyperv code out of staging > directory") from the staging tree. > > Just context changes. I fixed it up (see below) and can carry the fix as > necessary.
Also drivers/Makefile.
-- Cheers, Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/Makefile index 97c957b,ef693cf..0000000 --- a/drivers/Makefile +++ b/drivers/Makefile @@@ -127,5 -127,5 +127,6 @@@ obj-$(CONFIG_IOMMU_SUPPORT) += iommu # Virtualization drivers obj-$(CONFIG_VIRT_DRIVERS) += virt/ + obj-$(CONFIG_HYPERV) += hv/ +obj-$(CONFIG_PM_DEVFREQ) += devfreq/ [unhandled content-type:application/pgp-signature] | |