]> pilppa.org Git - linux-2.6-omap-h63xx.git/blobdiff - arch/ppc/syslib/m8260_setup.c
Merge branch 'upstream' of master.kernel.org:/pub/scm/linux/kernel/git/linville/wirel...
[linux-2.6-omap-h63xx.git] / arch / ppc / syslib / m8260_setup.c
index 8f80a42dfdb7ae9f55ef8d750fd1a6362af5385b..15f0d7323535f400b81603dd21f1bc00f2ecc50e 100644 (file)
@@ -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)
@@ -8,7 +6,6 @@
  *  Further modified for generic 8xx and 8260 by Dan.
  */
 
-#include <linux/config.h>
 #include <linux/sched.h>
 #include <linux/kernel.h>
 #include <linux/mm.h>
@@ -62,6 +59,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();
 }