diff options
| author |   Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-22 19:21:08 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-22 19:21:08 -0700 |
| commit | f10f114f199dbcb9e1d6b5a0b36a34acf93f6179 (patch) | |
| tree | 299058a338e245957bf9e132f5cbf222bd03cad6 /include/asm-mips/i8253.h | |
| parent | Merge git://git.infradead.org/battery-2.6 (diff) | |
| parent | [MIPS] time: Make c0_compare_int_usable more bullet proof (diff) | |
| download | linux-dev-f10f114f199dbcb9e1d6b5a0b36a34acf93f6179.tar.xz linux-dev-f10f114f199dbcb9e1d6b5a0b36a34acf93f6179.zip | |
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
[MIPS] time: Make c0_compare_int_usable more bullet proof
[MIPS] Kbuild: Use the new cc-cross-prefix feature.
[MIPS] Fix include wrapper symbol to something sane.
[MIPS] Malta: Delete dead code.
[MIPS] time: Add GT641xx timer0 clockevent driver
[MIPS] time: SMP-proofing of Sibyte clockevent/clocksource code.
[MIPS] time: SMP/NUMA-proofing of IP27 HUB RT timer code.
[MIPS] time: Fix calculation in clockevent_set_clock()
Diffstat (limited to 'include/asm-mips/i8253.h')
| -rw-r--r-- | include/asm-mips/i8253.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/asm-mips/i8253.h b/include/asm-mips/i8253.h index 8f689d7df6b1..affb32ce4af9 100644 --- a/include/asm-mips/i8253.h +++ b/include/asm-mips/i8253.h @@ -2,8 +2,8 @@ * Machine specific IO port address definition for generic. * Written by Osamu Tomita <tomita@cinet.co.jp> */ -#ifndef _MACH_IO_PORTS_H -#define _MACH_IO_PORTS_H +#ifndef __ASM_I8253_H +#define __ASM_I8253_H /* i8253A PIT registers */ #define PIT_MODE 0x43 @@ -27,4 +27,4 @@ extern void setup_pit_timer(void); -#endif /* !_MACH_IO_PORTS_H */ +#endif /* __ASM_I8253_H */ |