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 'for-2.6.37/misc' of git://git.kernel.dk/linux-2.6-block
[pandora-kernel.git]
/
arch
/
x86
/
include
/
asm
/
amd_iommu.h
diff --git
a/arch/x86/include/asm/amd_iommu.h
b/arch/x86/include/asm/amd_iommu.h
index
5af2982
..
a6863a2
100644
(file)
--- a/
arch/x86/include/asm/amd_iommu.h
+++ b/
arch/x86/include/asm/amd_iommu.h
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (C) 2007-20
09
Advanced Micro Devices, Inc.
+ * Copyright (C) 2007-20
10
Advanced Micro Devices, Inc.
* Author: Joerg Roedel <joerg.roedel@amd.com>
* Leo Duran <leo.duran@amd.com>
*
* Author: Joerg Roedel <joerg.roedel@amd.com>
* Leo Duran <leo.duran@amd.com>
*
@@
-24,11
+24,11
@@
#ifdef CONFIG_AMD_IOMMU
#ifdef CONFIG_AMD_IOMMU
-extern
void
amd_iommu_detect(void);
+extern
int
amd_iommu_detect(void);
#else
#else
-static inline
void amd_iommu_detect(void) {
}
+static inline
int amd_iommu_detect(void) { return -ENODEV;
}
#endif
#endif