diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-10-15 18:16:07 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-10-15 18:16:07 -0400 |
| commit | 2502991560dc8244dbe10e48473d85722c1e2ec1 (patch) | |
| tree | 63b1f3be2ed56ff06f1e8db709e4ce85d69c3add /include/asm-x86/i8253.h | |
| parent | 7e69a8c4d06b7ecb874f571e82b715a9f79bc3c4 (diff) | |
| parent | a9ff8f6462635c8d9f8d64b7b10ddcea8404d77b (diff) | |
Merge branch 'fixes' into for-linus
Conflicts:
arch/arm/mach-versatile/core.c
Diffstat (limited to 'include/asm-x86/i8253.h')
| -rw-r--r-- | include/asm-x86/i8253.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/asm-x86/i8253.h b/include/asm-x86/i8253.h index b51c0487fc41..15a5b530044e 100644 --- a/include/asm-x86/i8253.h +++ b/include/asm-x86/i8253.h | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | #ifndef __ASM_I8253_H__ | 1 | #ifndef ASM_X86__I8253_H |
| 2 | #define __ASM_I8253_H__ | 2 | #define ASM_X86__I8253_H |
| 3 | 3 | ||
| 4 | /* i8253A PIT registers */ | 4 | /* i8253A PIT registers */ |
| 5 | #define PIT_MODE 0x43 | 5 | #define PIT_MODE 0x43 |
| @@ -15,4 +15,4 @@ extern void setup_pit_timer(void); | |||
| 15 | #define inb_pit inb_p | 15 | #define inb_pit inb_p |
| 16 | #define outb_pit outb_p | 16 | #define outb_pit outb_p |
| 17 | 17 | ||
| 18 | #endif /* __ASM_I8253_H__ */ | 18 | #endif /* ASM_X86__I8253_H */ |