diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-06-30 09:57:05 +1000 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-06-30 09:57:05 +1000 |
| commit | 441dbb500b4344a8e3125e5aabab4f9dbf72514f (patch) | |
| tree | 3bb8fb1a88db3f5d03062a4887312f25c2e8041d /arch/powerpc/platforms/44x/warp-nand.c | |
| parent | dee805532a30183c4462305b4614e58bd83a7bc1 (diff) | |
| parent | 5ce4b59653b2c2053cd9a011918ac1e4747f24cc (diff) | |
| download | blackbird-op-linux-441dbb500b4344a8e3125e5aabab4f9dbf72514f.tar.gz blackbird-op-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.c | 3 |
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, |
