diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-10-14 20:31:54 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-10-14 20:31:54 -0400 |
| commit | 6dc6472581f693b5fc95aebedf67b4960fb85cf0 (patch) | |
| tree | 06a5a9a08519950575505273eabced331ed51405 /include/asm-x86/io_32.h | |
| parent | ee673eaa72d8d185012b1027a05e25aba18c267f (diff) | |
| parent | 8acd3a60bcca17c6d89c73cee3ad6057eb83ba1e (diff) | |
Merge commit 'origin'
Manual fixup of conflicts on:
arch/powerpc/include/asm/dcr-regs.h
drivers/net/ibm_newemac/core.h
Diffstat (limited to 'include/asm-x86/io_32.h')
| -rw-r--r-- | include/asm-x86/io_32.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/asm-x86/io_32.h b/include/asm-x86/io_32.h index e876d89ac156..4f7d878bda18 100644 --- a/include/asm-x86/io_32.h +++ b/include/asm-x86/io_32.h | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | #ifndef _ASM_IO_H | 1 | #ifndef ASM_X86__IO_32_H |
| 2 | #define _ASM_IO_H | 2 | #define ASM_X86__IO_32_H |
| 3 | 3 | ||
| 4 | #include <linux/string.h> | 4 | #include <linux/string.h> |
| 5 | #include <linux/compiler.h> | 5 | #include <linux/compiler.h> |
| @@ -281,4 +281,4 @@ BUILDIO(b, b, char) | |||
| 281 | BUILDIO(w, w, short) | 281 | BUILDIO(w, w, short) |
| 282 | BUILDIO(l, , int) | 282 | BUILDIO(l, , int) |
| 283 | 283 | ||
| 284 | #endif | 284 | #endif /* ASM_X86__IO_32_H */ |