diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2007-07-11 09:55:48 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2007-07-11 09:55:48 -0400 |
| commit | db1b39d8b860e3716620c225bc86e0ec41764e34 (patch) | |
| tree | 8739074db733ef767400ea92cfbfed9352ddb92d /include/asm-mips/sni.h | |
| parent | a6bc432e296dfa1f05d4b586ca5ca3085a2d42d7 (diff) | |
| parent | 4eb6bf6bfb580afaf1e1a1d30cba17a078530cf4 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/asm-mips/sni.h')
| -rw-r--r-- | include/asm-mips/sni.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/include/asm-mips/sni.h b/include/asm-mips/sni.h index f257509b914f..ddaf36a1e389 100644 --- a/include/asm-mips/sni.h +++ b/include/asm-mips/sni.h | |||
| @@ -146,9 +146,6 @@ extern unsigned int sni_brd_type; | |||
| 146 | #define SNI_A20R_IRQ_BASE MIPS_CPU_IRQ_BASE | 146 | #define SNI_A20R_IRQ_BASE MIPS_CPU_IRQ_BASE |
| 147 | #define SNI_A20R_IRQ_TIMER (SNI_A20R_IRQ_BASE+5) | 147 | #define SNI_A20R_IRQ_TIMER (SNI_A20R_IRQ_BASE+5) |
| 148 | 148 | ||
| 149 | #define SNI_DS1216_A20R_BASE 0xbc081ffc | ||
| 150 | #define SNI_DS1216_RM200_BASE 0xbcd41ffc | ||
| 151 | |||
| 152 | #define SNI_PCIT_INT_REG 0xbfff000c | 149 | #define SNI_PCIT_INT_REG 0xbfff000c |
| 153 | 150 | ||
| 154 | #define SNI_PCIT_INT_START 24 | 151 | #define SNI_PCIT_INT_START 24 |