Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c35bf4a5 authored by Pavel Machek's avatar Pavel Machek Committed by Russell King
Browse files

[ARM] Fix collie for -rc1 



This fixes compilation for collie after -rc1 platform_device
changes. And yes, it even boots.

Signed-off-by: default avatarPavel Machek <pavel@suse.cz>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent c5e1ae97

arch/arm/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -702,6 +702,8 @@ menu "Device Drivers" 


source "drivers/base/Kconfig"



source "drivers/connector/Kconfig"



if ALIGNMENT_TRAP

source "drivers/mtd/Kconfig"

endif

arch/arm/common/locomo.c

+1 −3
Original line number Diff line number Diff line
@@ -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);

arch/arm/common/scoop.c

+1 −1
Original line number Diff line number Diff line
@@ -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;