From bce29086eaeeafa1c621491107a59e813b917ccf Mon Sep 17 00:00:00 2001
From: Valentine Barshak <vbarshak@ru.mvista.com>
Date: Sat, 5 Apr 2008 05:24:37 +1100
Subject: [PATCH] --- yaml --- r: 91505 b: refs/heads/master c:
 d0c8df6e4525ebd38a7643ba3dbfe3989dddf781 h: refs/heads/master i:   91503:
 0d70f12211fc7d46926c8f7a57a331259fcfbeae v: v3

---
 [refs]                                       | 2 +-
 trunk/arch/powerpc/platforms/44x/warp-nand.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index b48db217b6c5..e5b7a8d8d5dc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9d7030be336ca64f9cd46707358e07c0dbd5e133
+refs/heads/master: d0c8df6e4525ebd38a7643ba3dbfe3989dddf781
diff --git a/trunk/arch/powerpc/platforms/44x/warp-nand.c b/trunk/arch/powerpc/platforms/44x/warp-nand.c
index 84ab78ff8c03..9150318cfc56 100644
--- a/trunk/arch/powerpc/platforms/44x/warp-nand.c
+++ b/trunk/arch/powerpc/platforms/44x/warp-nand.c
@@ -11,6 +11,7 @@
 #include <linux/mtd/partitions.h>
 #include <linux/mtd/nand.h>
 #include <linux/mtd/ndfc.h>
+#include <asm/machdep.h>
 
 #ifdef CONFIG_MTD_NAND_NDFC
 
@@ -100,6 +101,6 @@ static int warp_setup_nand_flash(void)
 
 	return 0;
 }
-device_initcall(warp_setup_nand_flash);
+machine_device_initcall(warp, warp_setup_nand_flash);
 
 #endif