git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...
[pandora-kernel.git]
/
drivers
/
pci
/
intel-iommu.c
diff --git
a/drivers/pci/intel-iommu.c
b/drivers/pci/intel-iommu.c
index
59f17ac
..
f02c34d
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 */
/*