projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge ../linux-2.6
[powerpc.git]
/
arch
/
ppc
/
syslib
/
m8260_setup.c
diff --git
a/arch/ppc/syslib/m8260_setup.c
b/arch/ppc/syslib/m8260_setup.c
index
fda75d7
..
76a2aa4
100644
(file)
--- a/
arch/ppc/syslib/m8260_setup.c
+++ b/
arch/ppc/syslib/m8260_setup.c
@@
-24,7
+24,7
@@
#include <asm/io.h>
#include <asm/pgtable.h>
#include <asm/mpc8260.h>
#include <asm/io.h>
#include <asm/pgtable.h>
#include <asm/mpc8260.h>
-#include <asm/
immap_
cpm2.h>
+#include <asm/cpm2.h>
#include <asm/machdep.h>
#include <asm/bootinfo.h>
#include <asm/time.h>
#include <asm/machdep.h>
#include <asm/bootinfo.h>
#include <asm/time.h>
@@
-33,7
+33,6
@@
unsigned char __res[sizeof(bd_t)];
unsigned char __res[sizeof(bd_t)];
-extern void cpm2_reset(void);
extern void pq2_find_bridges(void);
extern void pq2pci_init_irq(void);
extern void idma_pci9_init(void);
extern void pq2_find_bridges(void);
extern void pq2pci_init_irq(void);
extern void idma_pci9_init(void);
@@
-63,6
+62,10
@@
m8260_setup_arch(void)
if (initrd_start)
ROOT_DEV = Root_RAM0;
#endif
if (initrd_start)
ROOT_DEV = Root_RAM0;
#endif
+
+ identify_ppc_sys_by_name_and_id(BOARD_CHIP_NAME,
+ in_be32(CPM_MAP_ADDR + CPM_IMMR_OFFSET));
+
m82xx_board_setup();
}
m82xx_board_setup();
}