Merge git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client

[~andy/linux] / drivers / pci / pci-label.c

diff --git a/drivers/pci/pci-label.c b/drivers/pci/pci-label.c
index 824e247edc5882bc0ce80e1a161909d972bb4391..77cb2a14c896893e4898ae8ed2d6dbdc74279300 100644 (file)
--- a/drivers/pci/pci-label.c
+++ b/drivers/pci/pci-label.c
@@ -29,7 +29,6 @@
 #include <linux/nls.h>
 #include <linux/acpi.h>
 #include <linux/pci-acpi.h>
-#include <acpi/acpi_drivers.h>
 #include <acpi/acpi_bus.h>
 #include "pci.h"
 
@@ -174,6 +173,12 @@ pci_remove_acpi_index_label_files(struct pci_dev *pdev)
        return -1;
 }
 
+static inline bool
+device_has_dsm(struct device *dev)
+{
+       return false;
+}
+
 #else
 
 static const char device_label_dsm_uuid[] = {