TEST mfld pmu: differentiate MRST and MFLD pmu_pci_set_power_state
authorLen Brown <len.brown@intel.com>
Fri, 12 Aug 2011 21:44:30 +0000 (22:44 +0100)
committermgross <mark.gross@intel.com>
Wed, 9 Nov 2011 20:37:17 +0000 (12:37 -0800)
commitaa21f3152f37ff406edd20cdeed42b7c6113b5f3
tree0912e6c3dfd1bd34372e25ac7b561fc0ac8749c0
parentd8b6da4ce37ce9ea72b01e190231ead2eab197cc
TEST mfld pmu: differentiate MRST and MFLD pmu_pci_set_power_state

It is currently possible to build both MRST and MFLD into the kernel.
So we need to avoid a name conflict,
and bind the right version of pmu_pci_set_power_state().

Signed-off-by: Len Brown <len.brown@intel.com>
arch/x86/include/asm/mrst.h
arch/x86/platform/mfld/pmu.c
arch/x86/platform/mrst/pmu.c
drivers/pci/mid_pci.c