aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc/platforms/44x
diff options
context:
space:
mode:
authorValentine Barshak <vbarshak@ru.mvista.com>2008-06-05 09:36:38 -0400
committerJosh Boyer <jwboyer@linux.vnet.ibm.com>2008-06-11 08:06:25 -0400
commit156cea23acffaa270cf243a3a0f43e1e30682081 (patch)
tree561ed2594760a0a2fe54c4195c60294cb522d45d /arch/powerpc/platforms/44x
parent887942d7d62499999f7868f194d7f41fd6e88795 (diff)
powerpc/4xx: Fix resource issue in warp-nand.c
The "ndfc-chip" device doesn't need any resources. All resources are handled by the "ndfc-nand" device. Registering the same memory resource twice causes "cat /proc/iomem" to go into an infinite loop displaying NDFC memory addresses. Signed-off-by: Valentine Barshak <vbarshak@ru.mvista.com> Acked-by: Stefan Roese <sr@denx.de> Acked-by: Sean MacLennan <smaclennan@pikatech.com> Signed-off-by: Josh Boyer <jwboyer@linux.vnet.ibm.com>
Diffstat (limited to 'arch/powerpc/platforms/44x')
-rw-r--r--arch/powerpc/platforms/44x/warp-nand.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/powerpc/platforms/44x/warp-nand.c b/arch/powerpc/platforms/44x/warp-nand.c
index d293c702e734..7bec2815771a 100644
--- a/arch/powerpc/platforms/44x/warp-nand.c
+++ b/arch/powerpc/platforms/44x/warp-nand.c
@@ -94,8 +94,7 @@ static struct platform_nand_chip warp_nand_chip0 = {
94static struct platform_device warp_nand_device = { 94static struct platform_device warp_nand_device = {
95 .name = "ndfc-chip", 95 .name = "ndfc-chip",
96 .id = 0, 96 .id = 0,
97 .num_resources = 1, 97 .num_resources = 0,
98 .resource = &warp_ndfc,
99 .dev = { 98 .dev = {
100 .platform_data = &warp_nand_chip0, 99 .platform_data = &warp_nand_chip0,
101 .parent = &warp_ndfc_device.dev, 100 .parent = &warp_ndfc_device.dev,