git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
arch
/
ppc
/
boot
/
simple
/
embed_config.c
diff --git
a/arch/ppc/boot/simple/embed_config.c
b/arch/ppc/boot/simple/embed_config.c
index
491a691
..
840bff2
100644
(file)
--- a/
arch/ppc/boot/simple/embed_config.c
+++ b/
arch/ppc/boot/simple/embed_config.c
@@
-8,7
+8,6
@@
*/
#include <linux/types.h>
*/
#include <linux/types.h>
-#include <linux/config.h>
#include <linux/string.h>
#include <asm/reg.h>
#ifdef CONFIG_8xx
#include <linux/string.h>
#include <asm/reg.h>
#ifdef CONFIG_8xx
@@
-21,6
+20,9
@@
#ifdef CONFIG_40x
#include <asm/io.h>
#endif
#ifdef CONFIG_40x
#include <asm/io.h>
#endif
+#ifdef CONFIG_XILINX_VIRTEX
+#include <platforms/4xx/xparameters/xparameters.h>
+#endif
extern unsigned long timebase_period_ns;
/* For those boards that don't provide one.
extern unsigned long timebase_period_ns;
/* For those boards that don't provide one.
@@
-742,7
+744,7
@@
embed_config(bd_t **bdp)
}
#endif /* WILLOW */
}
#endif /* WILLOW */
-#if
def CONFIG_XILINX_ML300
+#if
defined(CONFIG_XILINX_ML300) || defined(CONFIG_XILINX_ML403)
void
embed_config(bd_t ** bdp)
{
void
embed_config(bd_t ** bdp)
{
@@
-779,7
+781,7
@@
embed_config(bd_t ** bdp)
timebase_period_ns = 1000000000 / bd->bi_tbfreq;
/* see bi_tbfreq definition in arch/ppc/platforms/4xx/xilinx_ml300.h */
}
timebase_period_ns = 1000000000 / bd->bi_tbfreq;
/* see bi_tbfreq definition in arch/ppc/platforms/4xx/xilinx_ml300.h */
}
-#endif /* CONFIG_XILINX_ML300 */
+#endif /* CONFIG_XILINX_ML300
|| CONFIG_XILINX_ML403
*/
#ifdef CONFIG_IBM_OPENBIOS
/* This could possibly work for all treeboot roms.
#ifdef CONFIG_IBM_OPENBIOS
/* This could possibly work for all treeboot roms.