projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
59c5f46
)
PM / Intel IOMMU: Fix init_iommu_pm_ops() for CONFIG_PM unset
author
Rafael J. Wysocki
<
[email protected]
>
Tue, 7 Jun 2011 19:32:31 +0000
(21:32 +0200)
committer
Rafael J. Wysocki
<
[email protected]
>
Tue, 7 Jun 2011 19:32:31 +0000
(21:32 +0200)
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 <
[email protected]
>
Signed-off-by: Rafael J. Wysocki <
[email protected]
>
drivers/pci/intel-iommu.c
patch
|
blob
|
history
diff --git
a/drivers/pci/intel-iommu.c
b/drivers/pci/intel-iommu.c
index 59f17acf7f68b6d3ec6b4a4798a937f299bef8a6..f02c34d26d1b08226599cfa4c183da703b9486ed 100644
(file)
--- 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 */
/*