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

Commit 70ac5516 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge master.kernel.org:/home/rmk/linux-2.6-arm

parents 7f729ccf bd5d080a

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;

arch/arm/kernel/smp.c

+1 −3
Original line number Diff line number Diff line
@@ -256,9 +256,7 @@ void __cpuexit cpu_die(void) 
asmlinkage void __cpuinit secondary_start_kernel(void)

{

	struct mm_struct *mm = &init_mm;

	unsigned int cpu;



	cpu = smp_processor_id();

	unsigned int cpu = smp_processor_id();



	printk("CPU%u: Booted secondary processor\n", cpu);

arch/arm/mach-footbridge/common.c

+12 −12
Original line number Diff line number Diff line
@@ -132,14 +132,14 @@ void __init footbridge_init_irq(void) 
static struct map_desc fb_common_io_desc[] __initdata = {

	{

		.virtual	= ARMCSR_BASE,

		.pfn		= DC21285_ARMCSR_BASE,

		.pfn		= __phys_to_pfn(DC21285_ARMCSR_BASE),

		.length		= ARMCSR_SIZE,

		.type		= MT_DEVICE

		.type		= MT_DEVICE,

	}, {

		.virtual	= XBUS_BASE,

		.pfn		= __phys_to_pfn(0x40000000),

		.length		= XBUS_SIZE,

		.type		= MT_DEVICE

		.type		= MT_DEVICE,

	}

};
@@ -153,28 +153,28 @@ static struct map_desc ebsa285_host_io_desc[] __initdata = { 
		.virtual	= PCIMEM_BASE,

		.pfn		= __phys_to_pfn(DC21285_PCI_MEM),

		.length		= PCIMEM_SIZE,

		.type		= MT_DEVICE

		.type		= MT_DEVICE,

	}, {

		.virtual	= PCICFG0_BASE,

		.pfn		= __phys_to_pfn(DC21285_PCI_TYPE_0_CONFIG),

		.length		= PCICFG0_SIZE,

		.type		= MT_DEVICE

		.type		= MT_DEVICE,

	}, {

		.virtual	= PCICFG1_BASE,

		.pfn		= __phys_to_pfn(DC21285_PCI_TYPE_1_CONFIG),

		.length		= PCICFG1_SIZE,

		.type		= MT_DEVICE

		.type		= MT_DEVICE,

	}, {

		.virtual	= PCIIACK_BASE,

		.pfn		= __phys_to_pfn(DC21285_PCI_IACK),

		.length		= PCIIACK_SIZE,

		.type		= MT_DEVICE

		.type		= MT_DEVICE,

	}, {

		.virtual	= PCIO_BASE,

		.pfn		= __phys_to_pfn(DC21285_PCI_IO),

		.length		= PCIO_SIZE,

		.type		= MT_DEVICE

	}

		.type		= MT_DEVICE,

	},

#endif

};
@@ -187,13 +187,13 @@ static struct map_desc co285_io_desc[] __initdata = { 
		.virtual	= PCIO_BASE,

		.pfn		= __phys_to_pfn(DC21285_PCI_IO),

		.length		= PCIO_SIZE,

		.type		= MT_DEVICE

		.type		= MT_DEVICE,

	}, {

		.virtual	= PCIMEM_BASE,

		.pfn		= __phys_to_pfn(DC21285_PCI_MEM),

		.length		= PCIMEM_SIZE,

		.type		= MT_DEVICE

	}

		.type		= MT_DEVICE,

	},

#endif

};