diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-17 13:56:34 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-17 13:56:34 -0500 |
commit | 7652aab77fbf6de8bcc69ee6a864270b0da6b3f6 (patch) | |
tree | cc380ac53a720a905232463cd8fed9cb27875723 /include/asm-mips/mach-db1x00/db1200.h | |
parent | cd02e27b1514a27b2a8ab59755ae6d23d4d8a10f (diff) | |
parent | aec8b7557cf0fc4dac059112328b5aa89271c77e (diff) |
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
Diffstat (limited to 'include/asm-mips/mach-db1x00/db1200.h')
-rw-r--r-- | include/asm-mips/mach-db1x00/db1200.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/asm-mips/mach-db1x00/db1200.h b/include/asm-mips/mach-db1x00/db1200.h index 5d894376fc1a..647fdb54cc1d 100644 --- a/include/asm-mips/mach-db1x00/db1200.h +++ b/include/asm-mips/mach-db1x00/db1200.h | |||
@@ -220,5 +220,8 @@ static BCSR * const bcsr = (BCSR *)BCSR_KSEG1_ADDR; | |||
220 | #define BOARD_PC1_INT DB1200_PC1_INT | 220 | #define BOARD_PC1_INT DB1200_PC1_INT |
221 | #define BOARD_CARD_INSERTED(SOCKET) bcsr->sig_status & (1<<(8+(2*SOCKET))) | 221 | #define BOARD_CARD_INSERTED(SOCKET) bcsr->sig_status & (1<<(8+(2*SOCKET))) |
222 | 222 | ||
223 | /* Nand chip select */ | ||
224 | #define NAND_CS 1 | ||
225 | |||
223 | #endif /* __ASM_DB1200_H */ | 226 | #endif /* __ASM_DB1200_H */ |
224 | 227 | ||