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
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
arch
/
ppc
/
syslib
/
ibm440sp_common.c
diff --git
a/arch/ppc/syslib/ibm440sp_common.c
b/arch/ppc/syslib/ibm440sp_common.c
index
417d4cf
..
571f8bc
100644
(file)
--- a/
arch/ppc/syslib/ibm440sp_common.c
+++ b/
arch/ppc/syslib/ibm440sp_common.c
@@
-1,7
+1,5
@@
/*
/*
- * arch/ppc/syslib/ibm440sp_common.c
- *
- * PPC440SP system library
+ * PPC440SP/PPC440SPe system library
*
* Matt Porter <mporter@kernel.crashing.org>
* Copyright 2002-2005 MontaVista Software Inc.
*
* Matt Porter <mporter@kernel.crashing.org>
* Copyright 2002-2005 MontaVista Software Inc.
@@
-15,7
+13,6
@@
* option) any later version.
*
*/
* option) any later version.
*
*/
-#include <linux/config.h>
#include <linux/types.h>
#include <linux/serial.h>
#include <linux/types.h>
#include <linux/serial.h>
@@
-35,7
+32,7
@@
unsigned long __init ibm440sp_find_end_of_memory(void)
u32 mem_size = 0;
/* Read two bank sizes and sum */
u32 mem_size = 0;
/* Read two bank sizes and sum */
- for (i=0; i<
2
; i++)
+ for (i=0; i<
MQ0_NUM_BANKS
; i++)
switch (mfdcr(DCRN_MQ0_BS0BAS + i) & MQ0_CONFIG_SIZE_MASK) {
case MQ0_CONFIG_SIZE_8M:
mem_size += PPC44x_MEM_SIZE_8M;
switch (mfdcr(DCRN_MQ0_BS0BAS + i) & MQ0_CONFIG_SIZE_MASK) {
case MQ0_CONFIG_SIZE_8M:
mem_size += PPC44x_MEM_SIZE_8M;