diff options
| author | Paul Mackerras <paulus@samba.org> | 2005-10-30 21:37:12 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-10-30 21:37:12 -0500 |
| commit | 23fd07750a789a66fe88cf173d52a18f1a387da4 (patch) | |
| tree | 06fdd6df35fdb835abdaa9b754d62f6b84b97250 /include/asm-mips/mips-boards/generic.h | |
| parent | bd787d438a59266af3c9f6351644c85ef1dd21fe (diff) | |
| parent | ed28f96ac1960f30f818374d65be71d2fdf811b0 (diff) | |
Merge ../linux-2.6 by hand
Diffstat (limited to 'include/asm-mips/mips-boards/generic.h')
| -rw-r--r-- | include/asm-mips/mips-boards/generic.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/include/asm-mips/mips-boards/generic.h b/include/asm-mips/mips-boards/generic.h index 65d1d16eab16..25b6ffc26623 100644 --- a/include/asm-mips/mips-boards/generic.h +++ b/include/asm-mips/mips-boards/generic.h | |||
| @@ -66,6 +66,7 @@ | |||
| 66 | #define MIPS_REVISION_CORID_CORE_EMUL 6 | 66 | #define MIPS_REVISION_CORID_CORE_EMUL 6 |
| 67 | #define MIPS_REVISION_CORID_CORE_FPGA2 7 | 67 | #define MIPS_REVISION_CORID_CORE_FPGA2 7 |
| 68 | #define MIPS_REVISION_CORID_CORE_FPGAR2 8 | 68 | #define MIPS_REVISION_CORID_CORE_FPGAR2 8 |
| 69 | #define MIPS_REVISION_CORID_CORE_FPGA3 9 | ||
| 69 | 70 | ||
| 70 | /**** Artificial corid defines ****/ | 71 | /**** Artificial corid defines ****/ |
| 71 | /* | 72 | /* |
| @@ -79,4 +80,10 @@ | |||
| 79 | 80 | ||
| 80 | extern unsigned int mips_revision_corid; | 81 | extern unsigned int mips_revision_corid; |
| 81 | 82 | ||
| 83 | #ifdef CONFIG_PCI | ||
| 84 | extern void mips_pcibios_init(void); | ||
| 85 | #else | ||
| 86 | #define mips_pcibios_init() do { } while (0) | ||
| 87 | #endif | ||
| 88 | |||
| 82 | #endif /* __ASM_MIPS_BOARDS_GENERIC_H */ | 89 | #endif /* __ASM_MIPS_BOARDS_GENERIC_H */ |