aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pci
diff options
context:
space:
mode:
authorRafael J. Wysocki <rjw@sisk.pl>2010-08-25 21:33:29 +0200
committerJesse Barnes <jbarnes@virtuousgeek.org>2010-08-25 12:54:03 -0700
commit6e63e80d88521a176989ed14b420f42dc418e46a (patch)
tree09f41fcc62e314806deaf7761cfad24e3667959e /drivers/pci
parenta9d2a6df11f5b9dc19ad4147374e8b67c4438158 (diff)
downloadkernel_samsung_smdk4412-6e63e80d88521a176989ed14b420f42dc418e46a.zip
kernel_samsung_smdk4412-6e63e80d88521a176989ed14b420f42dc418e46a.tar.gz
kernel_samsung_smdk4412-6e63e80d88521a176989ed14b420f42dc418e46a.tar.bz2
PCI hotplug: Fix build with CONFIG_ACPI unset
One of the recent changes caused complilation of drivers/pci/hotplug/pciehp_core.c to fail. Fix this issue. Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl> Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Diffstat (limited to 'drivers/pci')
-rw-r--r--drivers/pci/hotplug/pciehp.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/pci/hotplug/pciehp.h b/drivers/pci/hotplug/pciehp.h
index 653de6f..73d5139 100644
--- a/drivers/pci/hotplug/pciehp.h
+++ b/drivers/pci/hotplug/pciehp.h
@@ -178,5 +178,9 @@ static inline void pciehp_firmware_init(void)
}
#else
#define pciehp_firmware_init() do {} while (0)
+static inline int pciehp_acpi_slot_detection_check(struct pci_dev *dev)
+{
+ return 0;
+}
#endif /* CONFIG_ACPI */
#endif /* _PCIEHP_H */