X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=arch%2Farm%2Fmach-clps711x%2Ffortunet.c;h=3792ab4f09967c5bdd04cf537768003943167a22;hb=16c70f8c1b54b61c3b951b6fb220df250fe09b32;hp=7a4ba27df7b8284d56bf5b540d91243f60ab2c2e;hpb=9bf4aaab3e101692164d49b7ca357651eb691cb6;p=linux-2.6.git

diff --git a/arch/arm/mach-clps711x/fortunet.c b/arch/arm/mach-clps711x/fortunet.c
index 7a4ba27df..3792ab4f0 100644
--- a/arch/arm/mach-clps711x/fortunet.c
+++ b/arch/arm/mach-clps711x/fortunet.c
@@ -19,7 +19,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-#include <linux/config.h>
 #include <linux/types.h>
 #include <linux/init.h>
 #include <linux/initrd.h>
@@ -31,9 +30,9 @@
 
 #include <asm/mach/arch.h>
 
-extern void clps711x_map_io(void);
-extern void clps711x_init_irq(void);
-extern void clps711x_init_time(void);
+#include <asm/memory.h>
+
+#include "common.h"
 
 struct meminfo memmap = {
 	.nr_banks	= 1,
@@ -77,11 +76,12 @@ fortunet_fixup(struct machine_desc *desc, struct tag *tags,
 }
 
 MACHINE_START(FORTUNET, "ARM-FortuNet")
-	MAINTAINER("FortuNet Inc.")
-        BOOT_MEM(0xc0000000, 0x80000000, 0xf0000000)
-	BOOT_PARAMS(0x00000000)
-	FIXUP(fortunet_fixup)
-	MAPIO(clps711x_map_io)
-	INITIRQ(clps711x_init_irq)
-	INITTIME(clps711x_init_time)
+	/* Maintainer: FortuNet Inc. */
+	.phys_io	= 0x80000000,
+	.io_pg_offst	= ((0xf0000000) >> 18) & 0xfffc,
+	.boot_params	= 0x00000000,
+	.fixup		= fortunet_fixup,
+	.map_io		= clps711x_map_io,
+	.init_irq	= clps711x_init_irq,
+	.timer		= &clps711x_timer,
 MACHINE_END