diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-05 06:47:34 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-05 06:47:34 -0500 |
| commit | 0bd5c4f7c874cf48ff7904dcf8a59988c8fea0e8 (patch) | |
| tree | a89023849fa29d7b6cb987e10e3ea8a995409c86 /drivers/base | |
| parent | 7df4edb07cf54a4868b9a750424c0d2aa68f8d66 (diff) | |
| parent | ff2c8a4167eb143c5e2a03148fa996978938e8d7 (diff) | |
Merge branch 'iommu/fixes-2.6.29' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/linux-2.6-iommu into core/iommu
Diffstat (limited to 'drivers/base')
| -rw-r--r-- | drivers/base/iommu.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/base/iommu.c b/drivers/base/iommu.c index 5e039d4f877c..c2d1eed90376 100644 --- a/drivers/base/iommu.c +++ b/drivers/base/iommu.c | |||
| @@ -31,7 +31,7 @@ void register_iommu(struct iommu_ops *ops) | |||
| 31 | iommu_ops = ops; | 31 | iommu_ops = ops; |
| 32 | } | 32 | } |
| 33 | 33 | ||
| 34 | bool iommu_found() | 34 | bool iommu_found(void) |
| 35 | { | 35 | { |
| 36 | return iommu_ops != NULL; | 36 | return iommu_ops != NULL; |
| 37 | } | 37 | } |