commit d865fd09809a3a18669f35f970781820af40e4de
author Ricardo Ribalda Delgado <ricardo.ribalda@uam.es> Thu Jul 17 11:44:12 2008 +0200
committer Stefan Roese <sr@denx.de> Fri Jul 18 12:30:50 2008 +0200
tree 65506c7eae8f9ebe754f44dcd659a470c211db72
parent 42246dacf60d5028d3a48a220ce94efcf56faec4

ppc4xx: CPU PPC440x5 on Virtex5 FX

-This patchs gives support for the embbedded ppc440
 on the Virtex5 FPGAs
-interrupts.c divided in uic.c and interrupts.c
-xilinx_irq.c for xilinx interrupt controller
-Include modifications propossed by  Stefan Roese

Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@uam.es>
Acked-by: Stefan Roese <sr@denx.de>

include/ppc4xx.h

diff --git a/include/ppc4xx.h b/include/ppc4xx.h
index d593b07..5a6b8559 100644
--- a/include/ppc4xx.h
+++ b/include/ppc4xx.h
@@ -54,7 +54,9 @@
 
 #include <asm/ppc4xx-sdram.h>
 #include <asm/ppc4xx-ebc.h>
+#if !defined(CONFIG_XILINX_440)
 #include <asm/ppc4xx-uic.h>
+#endif
 
 /*
  * Macro for generating register field mnemonics