summaryrefslogtreecommitdiffstats
path: root/include/asm-x86/iommu.h
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-07-24 08:09:26 +0200
committerIngo Molnar <mingo@elte.hu>2008-07-24 08:09:26 +0200
commit28afe961a18f77b2249062499bdbf70fd2ec6bba (patch)
tree71a5cb32924b8c8256bbc0f2f81c6b8c2ac79108 /include/asm-x86/iommu.h
parent1e01cb0c6ff7e9ddb6547551794c6aa82785a7cb (diff)
parent338b9bb3adac0d2c5a1e180491d9b001d624c402 (diff)
downloadkernel-crypto-28afe961a18f77b2249062499bdbf70fd2ec6bba.tar.gz
kernel-crypto-28afe961a18f77b2249062499bdbf70fd2ec6bba.tar.xz
kernel-crypto-28afe961a18f77b2249062499bdbf70fd2ec6bba.zip
Merge branch 'linus' into tracing/urgent
Diffstat (limited to 'include/asm-x86/iommu.h')
-rw-r--r--include/asm-x86/iommu.h10
1 files changed, 9 insertions, 1 deletions
diff --git a/include/asm-x86/iommu.h b/include/asm-x86/iommu.h
index 068c9a40aa5..d63166fb3ab 100644
--- a/include/asm-x86/iommu.h
+++ b/include/asm-x86/iommu.h
@@ -25,10 +25,18 @@ extern void gart_iommu_hole_init(void);
static inline void early_gart_iommu_check(void)
{
}
-
+static inline void gart_iommu_init(void)
+{
+}
static inline void gart_iommu_shutdown(void)
{
}
+static inline void gart_parse_options(char *options)
+{
+}
+static inline void gart_iommu_hole_init(void)
+{
+}
#endif
#endif