forked from luck/tmp_suning_uos_patched
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
This commit is contained in:
commit
0bd5c4f7c8
@ -24,9 +24,7 @@
|
||||
#include <linux/scatterlist.h>
|
||||
#include <linux/dma-mapping.h>
|
||||
#include <linux/iommu-helper.h>
|
||||
#ifdef CONFIG_IOMMU_API
|
||||
#include <linux/iommu.h>
|
||||
#endif
|
||||
#include <asm/proto.h>
|
||||
#include <asm/iommu.h>
|
||||
#include <asm/gart.h>
|
||||
|
@ -31,7 +31,7 @@ void register_iommu(struct iommu_ops *ops)
|
||||
iommu_ops = ops;
|
||||
}
|
||||
|
||||
bool iommu_found()
|
||||
bool iommu_found(void)
|
||||
{
|
||||
return iommu_ops != NULL;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user