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 'fix/hda' into for-linus
[pandora-kernel.git]
/
arch
/
x86
/
include
/
asm
/
swiotlb.h
diff --git
a/arch/x86/include/asm/swiotlb.h
b/arch/x86/include/asm/swiotlb.h
index
87ffcb1
..
8085277
100644
(file)
--- a/
arch/x86/include/asm/swiotlb.h
+++ b/
arch/x86/include/asm/swiotlb.h
@@
-5,13
+5,17
@@
#ifdef CONFIG_SWIOTLB
extern int swiotlb;
#ifdef CONFIG_SWIOTLB
extern int swiotlb;
-extern int pci_swiotlb_init(void);
+extern int __init pci_swiotlb_detect(void);
+extern void __init pci_swiotlb_init(void);
#else
#define swiotlb 0
#else
#define swiotlb 0
-static inline int pci_swiotlb_
ini
t(void)
+static inline int pci_swiotlb_
detec
t(void)
{
return 0;
}
{
return 0;
}
+static inline void pci_swiotlb_init(void)
+{
+}
#endif
static inline void dma_mark_clean(void *addr, size_t size) {}
#endif
static inline void dma_mark_clean(void *addr, size_t size) {}