Skip to content

L
linux-davinci
Commit 881c4776 authored by Ingo Molnar's avatar Ingo Molnar
Browse files
Options

Merge branch 'x86/cleanups' into x86/core

parents ab639f35 89139374
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 4 deletions
arch/x86/include/asm/io.h
View file @ 881c4776
...@@ -105,5 +105,6 @@ extern void __iomem *early_memremap(unsigned long offset, unsigned long size); ...@@ -105,5 +105,6 @@ extern void __iomem *early_memremap(unsigned long offset, unsigned long size);
extern void early_iounmap(void __iomem *addr, unsigned long size); extern void early_iounmap(void __iomem *addr, unsigned long size);
extern void __iomem *fix_ioremap(unsigned idx, unsigned long phys); extern void __iomem *fix_ioremap(unsigned idx, unsigned long phys);
#define IO_SPACE_LIMIT 0xffff
#endif /* _ASM_X86_IO_H */ #endif /* _ASM_X86_IO_H */
arch/x86/include/asm/io_32.h
View file @ 881c4776
...@@ -37,8 +37,6 @@ ...@@ -37,8 +37,6 @@
* - Arnaldo Carvalho de Melo <acme@conectiva.com.br> * - Arnaldo Carvalho de Melo <acme@conectiva.com.br>
*/ */
#define IO_SPACE_LIMIT 0xffff
#define XQUAD_PORTIO_BASE 0xfe400000 #define XQUAD_PORTIO_BASE 0xfe400000
#define XQUAD_PORTIO_QUAD 0x40000 /* 256k per quad. */ #define XQUAD_PORTIO_QUAD 0x40000 /* 256k per quad. */
......
arch/x86/include/asm/io_64.h
View file @ 881c4776
...@@ -136,8 +136,6 @@ __OUTS(b) ...@@ -136,8 +136,6 @@ __OUTS(b)
__OUTS(w) __OUTS(w)
__OUTS(l) __OUTS(l)
#define IO_SPACE_LIMIT 0xffff
#if defined(__KERNEL__) && defined(__x86_64__) #if defined(__KERNEL__) && defined(__x86_64__)
#include <linux/vmalloc.h> #include <linux/vmalloc.h>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment