projects
/
GitHub
/
mt8127
/
android_kernel_alcatel_ttab.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
x86: consolidate header guards
[GitHub/mt8127/android_kernel_alcatel_ttab.git]
/
include
/
asm-x86
/
swiotlb.h
diff --git
a/include/asm-x86/swiotlb.h
b/include/asm-x86/swiotlb.h
index f5d9e74b1e4ab70a718886961113cafbdb2f4fcc..9486c400a71d9917e70a34189323d32fd5cd51f8 100644
(file)
--- a/
include/asm-x86/swiotlb.h
+++ b/
include/asm-x86/swiotlb.h
@@
-1,5
+1,5
@@
-#ifndef
_ASM
_SWIOTLB_H
-#define
_ASM_SWIOTLB_H 1
+#ifndef
ASM_X86_
_SWIOTLB_H
+#define
ASM_X86__SWIOTLB_H
#include <asm/dma-mapping.h>
#include <asm/dma-mapping.h>
@@
-45,12
+45,14
@@
extern int swiotlb_force;
#ifdef CONFIG_SWIOTLB
extern int swiotlb;
#ifdef CONFIG_SWIOTLB
extern int swiotlb;
+extern void pci_swiotlb_init(void);
#else
#define swiotlb 0
#else
#define swiotlb 0
+static inline void pci_swiotlb_init(void)
+{
+}
#endif
#endif
-extern void pci_swiotlb_init(void);
-
static inline void dma_mark_clean(void *addr, size_t size) {}
static inline void dma_mark_clean(void *addr, size_t size) {}
-#endif /*
_ASM
_SWIOTLB_H */
+#endif /*
ASM_X86_
_SWIOTLB_H */