diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2007-04-28 05:50:00 +1000 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-04-30 11:02:04 +1000 |
| commit | 5ff084f21da25ffcc5e0cb0293a0ea588cb46272 (patch) | |
| tree | 35eaea45ec826d0e8ed278faeb6a156a4a778e76 /include | |
| parent | 2b10caf380b0dbe3923b0ceefed17e3eaa7f2d4b (diff) | |
| download | linux-3.10-5ff084f21da25ffcc5e0cb0293a0ea588cb46272.tar.gz linux-3.10-5ff084f21da25ffcc5e0cb0293a0ea588cb46272.tar.bz2 linux-3.10-5ff084f21da25ffcc5e0cb0293a0ea588cb46272.zip | |
[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')
| -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 92fd02d7b17..ed6891af05d 100644 --- a/include/asm-ppc/ibm4xx.h +++ b/include/asm-ppc/ibm4xx.h @@ -47,12 +47,8 @@ #include <platforms/4xx/walnut.h> #endif -#if defined(CONFIG_XILINX_ML300) -#include <platforms/4xx/xilinx_ml300.h> -#endif - -#if defined(CONFIG_XILINX_ML403) -#include <platforms/4xx/xilinx_ml403.h> +#if defined(CONFIG_XILINX_VIRTEX) +#include <platforms/4xx/virtex.h> #endif #ifndef __ASSEMBLY__ |