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
/
misc-katana.c
diff --git
a/arch/ppc/boot/simple/misc-katana.c
b/arch/ppc/boot/simple/misc-katana.c
index
b6e1bb8
..
79a1bbc
100644
(file)
--- a/
arch/ppc/boot/simple/misc-katana.c
+++ b/
arch/ppc/boot/simple/misc-katana.c
@@
-1,6
+1,4
@@
/*
/*
- * arch/ppc/boot/simple/misc-katana.c
- *
* Set up MPSC values to bootwrapper can prompt user.
*
* Author: Mark A. Greer <source@mvista.com>
* Set up MPSC values to bootwrapper can prompt user.
*
* Author: Mark A. Greer <source@mvista.com>
@@
-11,7
+9,6
@@
* or implied.
*/
* or implied.
*/
-#include <linux/config.h>
#include <linux/types.h>
#include <asm/io.h>
#include <asm/mv64x60_defs.h>
#include <linux/types.h>
#include <asm/io.h>
#include <asm/mv64x60_defs.h>
@@
-26,6
+23,8
@@
extern u32 mv64x60_mpsc_clk_freq;
#define min(a,b) (((a) < (b)) ? (a) : (b))
#endif
#define min(a,b) (((a) < (b)) ? (a) : (b))
#endif
+unsigned long mv64360_get_mem_size(void);
+
void
mv64x60_board_init(void __iomem *old_base, void __iomem *new_base)
{
void
mv64x60_board_init(void __iomem *old_base, void __iomem *new_base)
{
@@
-35,3
+34,9
@@
mv64x60_board_init(void __iomem *old_base, void __iomem *new_base)
min(katana_bus_freq((void __iomem *)KATANA_CPLD_BASE),
MV64x60_TCLK_FREQ_MAX);
}
min(katana_bus_freq((void __iomem *)KATANA_CPLD_BASE),
MV64x60_TCLK_FREQ_MAX);
}
+
+unsigned long
+get_mem_size(void)
+{
+ return mv64360_get_mem_size();
+}