diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-19 12:01:22 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-19 12:01:22 -0700 |
commit | 0a4908e19fd016d60403fc76cf38b2d08d21e2d2 (patch) | |
tree | f8f33a474bfb9835625677c76735fb27fe0a2b75 /include/asm-mips/sni.h | |
parent | 2843483d2eb02ad104edbe8b2429fb6a39d25063 (diff) | |
parent | 6f75aaa72af19d3e4d144e13d59e71f51686b77f (diff) |
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] Delete totally outdated Documentation/mips/time.README
[MIPS] Kill duplicated setup_irq() for cp0 timer
[MIPS] Sibyte: Finish conversion to modern time APIs.
[MIPS] time: Helpers to compute clocksource/event shift and mult values.
[MIPS] SMTC: Build fix.
[MIPS] time: Delete dead code.
[MIPS] MIPSsim: Strip defconfig file to the bones.
Diffstat (limited to 'include/asm-mips/sni.h')
-rw-r--r-- | include/asm-mips/sni.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/asm-mips/sni.h b/include/asm-mips/sni.h index 4d43dbb7f8b..af081457f84 100644 --- a/include/asm-mips/sni.h +++ b/include/asm-mips/sni.h @@ -141,8 +141,6 @@ extern unsigned int sni_brd_type; #define A20R_PT_TIM0_ACK 0xbc050000 #define A20R_PT_TIM1_ACK 0xbc060000 -#define SNI_MIPS_IRQ_CPU_TIMER (MIPS_CPU_IRQ_BASE+7) - #define SNI_A20R_IRQ_BASE MIPS_CPU_IRQ_BASE #define SNI_A20R_IRQ_TIMER (SNI_A20R_IRQ_BASE+5) |