projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'x86/cpu' into x86/core
[firefly-linux-kernel-4.4.55.git]
/
include
/
asm-x86
/
amd_iommu_types.h
diff --git
a/include/asm-x86/amd_iommu_types.h
b/include/asm-x86/amd_iommu_types.h
index dcc812067394fd5e366810d0d57eb2dbf6f05d70..1ffa4e53c98931b670409c5b226bc23babfc4ef6 100644
(file)
--- a/
include/asm-x86/amd_iommu_types.h
+++ b/
include/asm-x86/amd_iommu_types.h
@@
-17,8
+17,8
@@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifndef
__AMD_IOMMU_TYPES_H__
-#define
__AMD_IOMMU_TYPES_H__
+#ifndef
ASM_X86__AMD_IOMMU_TYPES_H
+#define
ASM_X86__AMD_IOMMU_TYPES_H
#include <linux/types.h>
#include <linux/list.h>
#include <linux/types.h>
#include <linux/list.h>
@@
-341,4
+341,4
@@
static inline u16 calc_devid(u8 bus, u8 devfn)
return (((u16)bus) << 8) | devfn;
}
return (((u16)bus) << 8) | devfn;
}
-#endif
+#endif
/* ASM_X86__AMD_IOMMU_TYPES_H */