diff --git a/[refs] b/[refs] index e6c8e1a97571..a29233cec086 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0ea648441a189f6e3e90a25c74511738799a0c7a +refs/heads/master: 33f35f2a4ee3abfc0f87990058aa1b6b5092f725 diff --git a/trunk/arch/x86/include/asm/io.h b/trunk/arch/x86/include/asm/io.h index d02804d650c4..d8e8eefbe24c 100644 --- a/trunk/arch/x86/include/asm/io.h +++ b/trunk/arch/x86/include/asm/io.h @@ -40,8 +40,6 @@ #include #include -#include - #define build_mmio_read(name, size, type, reg, barrier) \ static inline type name(const volatile void __iomem *addr) \ { type ret; asm volatile("mov" size " %1,%0":reg (ret) \ @@ -334,6 +332,7 @@ extern void fixup_early_ioremap(void); extern bool is_early_ioremap_ptep(pte_t *ptep); #ifdef CONFIG_XEN +#include struct bio_vec; extern bool xen_biovec_phys_mergeable(const struct bio_vec *vec1,