diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2011-06-07 21:32:31 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rjw@sisk.pl> | 2011-06-07 21:32:31 +0200 |
| commit | 99592ba4a80edb84938e7e0cf71fdecff1ce67fd (patch) | |
| tree | a60f9a74b5fbd1f00481c28576d4a18910cb852e /drivers/pci | |
| parent | 59c5f46fbe01a00eedf54a23789634438bb80603 (diff) | |
| download | kernel_samsung_smdk4412-99592ba4a80edb84938e7e0cf71fdecff1ce67fd.tar.gz kernel_samsung_smdk4412-99592ba4a80edb84938e7e0cf71fdecff1ce67fd.tar.bz2 kernel_samsung_smdk4412-99592ba4a80edb84938e7e0cf71fdecff1ce67fd.zip | |
PM / Intel IOMMU: Fix init_iommu_pm_ops() for CONFIG_PM unset
If CONFIG_PM is not set, init_iommu_pm_ops() introduced by commit
134fac3f457f3dd753ecdb25e6da3e5f6629f696 (PCI / Intel IOMMU: Use
syscore_ops instead of sysdev class and sysdev) is not defined
appropriately. Fix this issue.
Reported-by: Tony Luck <tony.luck@intel.com>
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Diffstat (limited to 'drivers/pci')
| -rw-r--r-- | drivers/pci/intel-iommu.c | 2 |
1 files changed, 1 insertions, 1 deletions
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) } #else -static inline int init_iommu_pm_ops(void) { } +static inline void init_iommu_pm_ops(void) {} #endif /* CONFIG_PM */ /* |