Make sure that the drivers for the NAND device and the SSP device are not being used to avoid conflicts.
Signed-off-by: Kristen Carlson Accardi <[email protected]> --- arch/x86/pci/mrst.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/arch/x86/pci/mrst.c b/arch/x86/pci/mrst.c index 936b1ad..c46b14c 100644 --- a/arch/x86/pci/mrst.c +++ b/arch/x86/pci/mrst.c @@ -271,10 +271,17 @@ static void __devinit mrst_power_off_unused_dev(struct pci_dev *dev) pci_set_power_state(dev, PCI_D3cold); } DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x0801, mrst_power_off_unused_dev); +#if !defined(CONFIG_SPECTRA) && !defined(CONFIG_SPECTRA_MODULE) &&\ + !defined(CONFIG_MTD_NAND_DENALI) &&\ + !defined(CONFIG_MTD_NAND_DENALI_MODULE) DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x0809, mrst_power_off_unused_dev); +#endif DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x080C, mrst_power_off_unused_dev); DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x0812, mrst_power_off_unused_dev); +#if !defined(CONFIG_SPI_INTEL_MID_SSP) &&\ + !defined(CONFIG_SPI_INTEL_MID_SSP_MODULE) DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x0815, mrst_power_off_unused_dev); +#endif /* * The Firmware should program the Langwell keypad registers to indicate -- 1.7.3.1 _______________________________________________ MeeGo-kernel mailing list [email protected] http://lists.meego.com/listinfo/meego-kernel
