diff options
| author | Dave Jones <davej@redhat.com> | 2005-11-21 09:56:52 -0500 |
|---|---|---|
| committer | Dave Jones <davej@redhat.com> | 2005-11-21 09:56:52 -0500 |
| commit | e7e37ee9c547213d726b29c2510cbb6696050405 (patch) | |
| tree | 50c45625de666b23f209d79eb1bfae05c64feee9 /include/asm-mips/mach-pb1x00/pb1200.h | |
| parent | c243f1f1f6545985afcc6adf1fc085729029c3ee (diff) | |
| parent | db93a82fa9d8b4d6e31c227922eaae829253bb88 (diff) | |
Merge ../linus/
Diffstat (limited to 'include/asm-mips/mach-pb1x00/pb1200.h')
| -rw-r--r-- | include/asm-mips/mach-pb1x00/pb1200.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/asm-mips/mach-pb1x00/pb1200.h b/include/asm-mips/mach-pb1x00/pb1200.h index 9a3088b19bf3..409d443322c1 100644 --- a/include/asm-mips/mach-pb1x00/pb1200.h +++ b/include/asm-mips/mach-pb1x00/pb1200.h | |||
| @@ -248,5 +248,8 @@ static BCSR * const bcsr = (BCSR *)BCSR_KSEG1_ADDR; | |||
| 248 | #define BOARD_PC1_INT PB1200_PC1_INT | 248 | #define BOARD_PC1_INT PB1200_PC1_INT |
| 249 | #define BOARD_CARD_INSERTED(SOCKET) bcsr->sig_status & (1<<(8+(2*SOCKET))) | 249 | #define BOARD_CARD_INSERTED(SOCKET) bcsr->sig_status & (1<<(8+(2*SOCKET))) |
| 250 | 250 | ||
| 251 | /* Nand chip select */ | ||
| 252 | #define NAND_CS 1 | ||
| 253 | |||
| 251 | #endif /* __ASM_PB1200_H */ | 254 | #endif /* __ASM_PB1200_H */ |
| 252 | 255 | ||