diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-12-23 16:30:27 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-12-23 16:30:27 +0100 |
| commit | 3e5621edb3392b28efb260ac99b2d26fb8b44e73 (patch) | |
| tree | 6d26f08661344d6f17271b287a4a89b9b85a9222 /arch/x86/include/asm/io.h | |
| parent | be9a1d3c2e559b267983bcf8b003997b83befb49 (diff) | |
| parent | 181de82ee3ffda1175f89d50c991dae31b79280c (diff) | |
| download | kernel_samsung_tuna-3e5621edb3392b28efb260ac99b2d26fb8b44e73.zip kernel_samsung_tuna-3e5621edb3392b28efb260ac99b2d26fb8b44e73.tar.gz kernel_samsung_tuna-3e5621edb3392b28efb260ac99b2d26fb8b44e73.tar.bz2 | |
Merge branch 'x86/iommu' into x86/core
Diffstat (limited to 'arch/x86/include/asm/io.h')
| -rw-r--r-- | arch/x86/include/asm/io.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/x86/include/asm/io.h b/arch/x86/include/asm/io.h index 33513b9..05cfed4 100644 --- a/arch/x86/include/asm/io.h +++ b/arch/x86/include/asm/io.h @@ -80,8 +80,6 @@ static inline void writeq(__u64 val, volatile void __iomem *addr) #define readq readq #define writeq writeq -extern int iommu_bio_merge; - #ifdef CONFIG_X86_32 # include "io_32.h" #else |