From ebaac41dc6a2c26a452e3896b2bcbacc916972ee Mon Sep 17 00:00:00 2001 From: Pavel Machek Date: Sat, 12 Nov 2005 20:25:25 +0000 Subject: [PATCH] --- yaml --- r: 14139 b: refs/heads/master c: c35bf4a593631850ab437b37ddcded4e05548e9e h: refs/heads/master i: 14137: 774dafd3733a27761edd961fd07a7e64a354c8b7 14135: 60933cff35ac8caa401efc8aadb8fff47562c0e7 v: v3 --- [refs] | 2 +- trunk/arch/arm/Kconfig | 2 ++ trunk/arch/arm/common/locomo.c | 4 +--- trunk/arch/arm/common/scoop.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 728f580cac77..d995b5aa5b2b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c5e1ae9729d97d3c543cc70d7865df1e724da0d0 +refs/heads/master: c35bf4a593631850ab437b37ddcded4e05548e9e diff --git a/trunk/arch/arm/Kconfig b/trunk/arch/arm/Kconfig index 3df7cbd924a1..70b007e66926 100644 --- a/trunk/arch/arm/Kconfig +++ b/trunk/arch/arm/Kconfig @@ -702,6 +702,8 @@ menu "Device Drivers" source "drivers/base/Kconfig" +source "drivers/connector/Kconfig" + if ALIGNMENT_TRAP source "drivers/mtd/Kconfig" endif diff --git a/trunk/arch/arm/common/locomo.c b/trunk/arch/arm/common/locomo.c index 557e52c1c869..1b7eaab02b9e 100644 --- a/trunk/arch/arm/common/locomo.c +++ b/trunk/arch/arm/common/locomo.c @@ -623,8 +623,6 @@ static int locomo_resume(struct platform_device *dev) locomo_writel(0x1, lchip->base + LOCOMO_KEYBOARD + LOCOMO_KCMD); spin_unlock_irqrestore(&lchip->lock, flags); - - dev->power.saved_state = NULL; kfree(save); return 0; @@ -775,7 +773,7 @@ static int locomo_probe(struct platform_device *dev) static int locomo_remove(struct platform_device *dev) { - struct locomo *lchip = platform__get_drvdata(dev); + struct locomo *lchip = platform_get_drvdata(dev); if (lchip) { __locomo_remove(lchip); diff --git a/trunk/arch/arm/common/scoop.c b/trunk/arch/arm/common/scoop.c index 32924c6714fe..0c3cbd9a388b 100644 --- a/trunk/arch/arm/common/scoop.c +++ b/trunk/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;