diff options
Diffstat (limited to 'drivers/pci')
-rw-r--r-- | drivers/pci/Makefile | 1 | ||||
-rw-r--r-- | drivers/pci/intel-iommu.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/drivers/pci/Makefile b/drivers/pci/Makefile index c85f744270a..094308e41be 100644 --- a/drivers/pci/Makefile +++ b/drivers/pci/Makefile | |||
@@ -51,6 +51,7 @@ obj-$(CONFIG_X86_VISWS) += setup-irq.o | |||
51 | obj-$(CONFIG_MN10300) += setup-bus.o | 51 | obj-$(CONFIG_MN10300) += setup-bus.o |
52 | obj-$(CONFIG_MICROBLAZE) += setup-bus.o | 52 | obj-$(CONFIG_MICROBLAZE) += setup-bus.o |
53 | obj-$(CONFIG_TILE) += setup-bus.o setup-irq.o | 53 | obj-$(CONFIG_TILE) += setup-bus.o setup-irq.o |
54 | obj-$(CONFIG_SPARC_LEON) += setup-bus.o setup-irq.o | ||
54 | 55 | ||
55 | # | 56 | # |
56 | # ACPI Related PCI FW Functions | 57 | # ACPI Related PCI FW Functions |
diff --git a/drivers/pci/intel-iommu.c b/drivers/pci/intel-iommu.c index 59f17acf7f6..f02c34d26d1 100644 --- a/drivers/pci/intel-iommu.c +++ b/drivers/pci/intel-iommu.c | |||
@@ -3388,7 +3388,7 @@ static void __init init_iommu_pm_ops(void) | |||
3388 | } | 3388 | } |
3389 | 3389 | ||
3390 | #else | 3390 | #else |
3391 | static inline int init_iommu_pm_ops(void) { } | 3391 | static inline void init_iommu_pm_ops(void) {} |
3392 | #endif /* CONFIG_PM */ | 3392 | #endif /* CONFIG_PM */ |
3393 | 3393 | ||
3394 | /* | 3394 | /* |