Let authors holds copyright of the AR7 code (closes #2369)

[openwrt/svn-archive/archive.git] / target / linux / ar7 / files / arch / mips / ar7 / setup.c

diff --git a/target/linux/ar7/files/arch/mips/ar7/setup.c b/target/linux/ar7/files/arch/mips/ar7/setup.c
index 8ac7577771b8b1a3d13ed8d84c349cf404ac73b9..3448fd2626698cc745d86ed2aba1bb280ae52d1b 100644 (file)
--- a/target/linux/ar7/files/arch/mips/ar7/setup.c
+++ b/target/linux/ar7/files/arch/mips/ar7/setup.c
@@ -1,8 +1,4 @@
 /*
- * $Id$
- *
- * Copyright (C) 2006, 2007 OpenWrt.org
- *
  * Carsten Langgaard, carstenl@mips.com
  * Copyright (C) 2000 MIPS Technologies, Inc.  All rights reserved.
  *
@@ -19,16 +15,19 @@
  *  with this program; if not, write to the Free Software Foundation, Inc.,
  *  59 Temple Place - Suite 330, Boston MA 02111-1307, USA.
  */
+#include <linux/version.h>
 #include <linux/init.h>
 #include <linux/ioport.h>
 #include <linux/pm.h>
 
-#include <asm/mips-boards/prom.h>
 #include <asm/reboot.h>
 #include <asm/time.h>
 #include <asm/ar7/ar7.h>
+#include <asm/ar7/prom.h>
 
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 24) /* TODO remove when 2.6.24 is stable */
 extern void ar7_time_init(void);
+#endif
 static void ar7_machine_restart(char *command);
 static void ar7_machine_halt(void);
 static void ar7_machine_power_off(void);
@@ -87,7 +86,9 @@ void __init plat_mem_setup(void)
        _machine_restart = ar7_machine_restart;
        _machine_halt = ar7_machine_halt;
        pm_power_off = ar7_machine_power_off;
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 24) /* TODO remove when 2.6.24 is stable */
        board_time_init = ar7_time_init;
+#endif
        panic_timeout = 3;
 
        io_base = (unsigned long)ioremap(AR7_REGS_BASE, 0x10000);
@@ -102,7 +103,8 @@ void __init plat_mem_setup(void)
        iomem_resource.start  = 0;
        iomem_resource.end    = ~0;
 
-       printk("%s, ID: 0x%04x, Revision: 0x%02x\n", get_system_type(), 
+       printk(KERN_INFO "%s, ID: 0x%04x, Revision: 0x%02x\n",
+                                       get_system_type(),
                ar7_chip_id(), ar7_chip_rev());
 }