diff --git a/[refs] b/[refs]
index 20720a496b6b..6cd12ad2f733 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 887942d7d62499999f7868f194d7f41fd6e88795
+refs/heads/master: 156cea23acffaa270cf243a3a0f43e1e30682081
diff --git a/trunk/arch/powerpc/platforms/44x/warp-nand.c b/trunk/arch/powerpc/platforms/44x/warp-nand.c
index d293c702e734..7bec2815771a 100644
--- a/trunk/arch/powerpc/platforms/44x/warp-nand.c
+++ b/trunk/arch/powerpc/platforms/44x/warp-nand.c
@@ -94,8 +94,7 @@ static struct platform_nand_chip warp_nand_chip0 = {
 static struct platform_device warp_nand_device = {
 	.name = "ndfc-chip",
 	.id = 0,
-	.num_resources = 1,
-	.resource = &warp_ndfc,
+	.num_resources = 0,
 	.dev = {
 		.platform_data = &warp_nand_chip0,
 		.parent = &warp_ndfc_device.dev,