Merge branch 'upstream' into max-sect

[linux-2.6-omap-h63xx.git] / arch / ppc / syslib / m8260_setup.c

diff --git a/arch/ppc/syslib/m8260_setup.c b/arch/ppc/syslib/m8260_setup.c
index 8f80a42dfdb7ae9f55ef8d750fd1a6362af5385b..b7a6cb2d8d526b7f6273c4653009fea99e40827e 100644 (file)
--- a/arch/ppc/syslib/m8260_setup.c
+++ b/arch/ppc/syslib/m8260_setup.c
@@ -1,6 +1,4 @@
 /*
- *  arch/ppc/syslib/m8260_setup.c
- *
  *  Copyright (C) 1995  Linus Torvalds
  *  Adapted from 'alpha' version by Gary Thomas
  *  Modified by Cort Dougan (cort@cs.nmt.edu)
@@ -62,6 +60,10 @@ m8260_setup_arch(void)
        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();
 }