diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-13 18:17:54 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-13 18:17:54 -0800 |
| commit | 70ac551651a2c5a234b703d9a495817f2ca09639 (patch) | |
| tree | 71f55b9a3de438969a7a0d951971febf59784294 /arch/arm/common/scoop.c | |
| parent | 7f729ccff35befa08a836ab33a4372c7f6735645 (diff) | |
| parent | bd5d080ab99642e3245ef7cfa54490384c01d878 (diff) | |
| download | blackbird-op-linux-70ac551651a2c5a234b703d9a495817f2ca09639.tar.gz blackbird-op-linux-70ac551651a2c5a234b703d9a495817f2ca09639.zip | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'arch/arm/common/scoop.c')
| -rw-r--r-- | arch/arm/common/scoop.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/common/scoop.c b/arch/arm/common/scoop.c index 32924c6714fe..0c3cbd9a388b 100644 --- a/arch/arm/common/scoop.c +++ b/arch/arm/common/scoop.c @@ -153,7 +153,7 @@ int __init scoop_probe(struct platform_device *pdev) printk("Sharp Scoop Device found at 0x%08x -> 0x%08x\n",(unsigned int)mem->start,(unsigned int)devptr->base); SCOOP_REG(devptr->base, SCOOP_MCR) = 0x0140; - reset_scoop(dev); + reset_scoop(&pdev->dev); SCOOP_REG(devptr->base, SCOOP_GPCR) = inf->io_dir & 0xffff; SCOOP_REG(devptr->base, SCOOP_GPWR) = inf->io_out & 0xffff; |
