mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-05 00:20:32 +00:00
[ARM] Fix collie for -rc1
This fixes compilation for collie after -rc1 platform_device changes. And yes, it even boots. Signed-off-by: Pavel Machek <pavel@suse.cz> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
This commit is contained in:
parent
c5e1ae9729
commit
c35bf4a593
3 changed files with 4 additions and 4 deletions
|
@ -702,6 +702,8 @@ menu "Device Drivers"
|
||||||
|
|
||||||
source "drivers/base/Kconfig"
|
source "drivers/base/Kconfig"
|
||||||
|
|
||||||
|
source "drivers/connector/Kconfig"
|
||||||
|
|
||||||
if ALIGNMENT_TRAP
|
if ALIGNMENT_TRAP
|
||||||
source "drivers/mtd/Kconfig"
|
source "drivers/mtd/Kconfig"
|
||||||
endif
|
endif
|
||||||
|
|
|
@ -623,8 +623,6 @@ static int locomo_resume(struct platform_device *dev)
|
||||||
locomo_writel(0x1, lchip->base + LOCOMO_KEYBOARD + LOCOMO_KCMD);
|
locomo_writel(0x1, lchip->base + LOCOMO_KEYBOARD + LOCOMO_KCMD);
|
||||||
|
|
||||||
spin_unlock_irqrestore(&lchip->lock, flags);
|
spin_unlock_irqrestore(&lchip->lock, flags);
|
||||||
|
|
||||||
dev->power.saved_state = NULL;
|
|
||||||
kfree(save);
|
kfree(save);
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
@ -775,7 +773,7 @@ static int locomo_probe(struct platform_device *dev)
|
||||||
|
|
||||||
static int locomo_remove(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) {
|
if (lchip) {
|
||||||
__locomo_remove(lchip);
|
__locomo_remove(lchip);
|
||||||
|
|
|
@ -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);
|
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;
|
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_GPCR) = inf->io_dir & 0xffff;
|
||||||
SCOOP_REG(devptr->base, SCOOP_GPWR) = inf->io_out & 0xffff;
|
SCOOP_REG(devptr->base, SCOOP_GPWR) = inf->io_out & 0xffff;
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue