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-mips/lasat/lasatint.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-mips/lasat/lasatint.h')
| -rw-r--r-- | include/asm-mips/lasat/lasatint.h | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/include/asm-mips/lasat/lasatint.h b/include/asm-mips/lasat/lasatint.h deleted file mode 100644 index e0d2458b43d0..000000000000 --- a/include/asm-mips/lasat/lasatint.h +++ /dev/null | |||
| @@ -1,14 +0,0 @@ | |||
| 1 | #ifndef __ASM_LASAT_LASATINT_H | ||
| 2 | #define __ASM_LASAT_LASATINT_H | ||
| 3 | |||
| 4 | /* lasat 100 */ | ||
| 5 | #define LASAT_INT_STATUS_REG_100 (KSEG1ADDR(0x1c880000)) | ||
| 6 | #define LASAT_INT_MASK_REG_100 (KSEG1ADDR(0x1c890000)) | ||
| 7 | #define LASATINT_MASK_SHIFT_100 0 | ||
| 8 | |||
| 9 | /* lasat 200 */ | ||
| 10 | #define LASAT_INT_STATUS_REG_200 (KSEG1ADDR(0x1104003c)) | ||
| 11 | #define LASAT_INT_MASK_REG_200 (KSEG1ADDR(0x1104003c)) | ||
| 12 | #define LASATINT_MASK_SHIFT_200 16 | ||
| 13 | |||
| 14 | #endif /* __ASM_LASAT_LASATINT_H */ | ||