diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2007-04-27 15:50:00 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-04-29 21:02:04 -0400 |
| commit | 5ff084f21da25ffcc5e0cb0293a0ea588cb46272 (patch) | |
| tree | 35eaea45ec826d0e8ed278faeb6a156a4a778e76 /include/asm-ppc/ibm4xx.h | |
| parent | 2b10caf380b0dbe3923b0ceefed17e3eaa7f2d4b (diff) | |
[POWERPC] Merge common virtex header files
The header files for the ml403 and ml300 are virtually identical, merge
them into a single file.
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'include/asm-ppc/ibm4xx.h')
| -rw-r--r-- | include/asm-ppc/ibm4xx.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/include/asm-ppc/ibm4xx.h b/include/asm-ppc/ibm4xx.h index 92fd02d7b177..ed6891af05d3 100644 --- a/include/asm-ppc/ibm4xx.h +++ b/include/asm-ppc/ibm4xx.h | |||
| @@ -47,12 +47,8 @@ | |||
| 47 | #include <platforms/4xx/walnut.h> | 47 | #include <platforms/4xx/walnut.h> |
| 48 | #endif | 48 | #endif |
| 49 | 49 | ||
| 50 | #if defined(CONFIG_XILINX_ML300) | 50 | #if defined(CONFIG_XILINX_VIRTEX) |
| 51 | #include <platforms/4xx/xilinx_ml300.h> | 51 | #include <platforms/4xx/virtex.h> |
| 52 | #endif | ||
| 53 | |||
| 54 | #if defined(CONFIG_XILINX_ML403) | ||
| 55 | #include <platforms/4xx/xilinx_ml403.h> | ||
| 56 | #endif | 52 | #endif |
| 57 | 53 | ||
| 58 | #ifndef __ASSEMBLY__ | 54 | #ifndef __ASSEMBLY__ |