summaryrefslogtreecommitdiffstats
path: root/arch/powerpc/platforms/44x/warp-nand.c
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2008-06-30 01:57:05 +0200
committerPaul Mackerras <paulus@samba.org>2008-06-30 01:57:05 +0200
commit441dbb500b4344a8e3125e5aabab4f9dbf72514f (patch)
tree3bb8fb1a88db3f5d03062a4887312f25c2e8041d /arch/powerpc/platforms/44x/warp-nand.c
parentpowerpc: Add dma nodes to 83xx, 85xx and 86xx boards (diff)
parentpowerpc/4xx: Workaround for PPC440EPx/GRx PCI_28 Errata (diff)
downloadlinux-441dbb500b4344a8e3125e5aabab4f9dbf72514f.tar.xz
linux-441dbb500b4344a8e3125e5aabab4f9dbf72514f.zip
Merge branch 'next' of master.kernel.org:/pub/scm/linux/kernel/git/jwboyer/powerpc-4xx
Diffstat (limited to 'arch/powerpc/platforms/44x/warp-nand.c')
-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 = {
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,