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

Commit 66b5920f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

parents 49bd96c2 9b73fcf8

arch/arm/mach-clps7500/core.c

+1 −1
Original line number Diff line number Diff line
@@ -260,7 +260,7 @@ static void __init clps7500_init_irq(void) 


static struct map_desc cl7500_io_desc[] __initdata = {

	{ 	/* IO space	*/

		.virtual	= IO_BASE,

		.virtual	= (unsigned long)IO_BASE,

		.pfn		= __phys_to_pfn(IO_START),

		.length		= IO_SIZE,

		.type		= MT_DEVICE

arch/arm/mach-pxa/tosa.c

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 


#include <linux/kernel.h>

#include <linux/init.h>

#include <linux/device.h>

#include <linux/platform_device.h>

#include <linux/major.h>

#include <linux/fs.h>

#include <linux/interrupt.h>

arch/arm/mach-sa1100/assabet.c

+2 −1
Original line number Diff line number Diff line
@@ -293,7 +293,8 @@ static void __init get_assabet_scr(void) 
	GPDR |= 0x3fc;			/* Configure GPIO 9:2 as outputs */

	GPSR = 0x3fc;			/* Write 0xFF to GPIO 9:2 */

	GPDR &= ~(0x3fc);		/* Configure GPIO 9:2 as inputs */

	for(i = 100; i--; scr = GPLR);	/* Read GPIO 9:2 */

	for(i = 100; i--; )		/* Read GPIO 9:2 */

		scr = GPLR;

	GPDR |= 0x3fc;			/*  restore correct pin direction */

	scr &= 0x3fc;			/* save as system configuration byte. */

	SCR_value = scr;

include/asm-arm/arch-ebsa110/io.h

+1 −1
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ void __writel(u32 val, void __iomem *addr); 
#define writew(v,b)		__writew(v,b)

#define writel(v,b)		__writel(v,b)



#define __arch_ioremap(cookie,sz,c,a)	((void __iomem *)(cookie))

#define __arch_ioremap(cookie,sz,c)	((void __iomem *)(cookie))

#define __arch_iounmap(cookie)		do { } while (0)



extern void insb(unsigned int port, void *buf, int sz);

include/asm-arm/arch-ixp4xx/ixp4xx-regs.h

+1 −0
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ 
 * Queue Manager

 */

#define IXP4XX_QMGR_BASE_PHYS		(0x60000000)

#define IXP4XX_QMGR_REGION_SIZE		(0x00004000)



/*

 * Expansion BUS Configuration registers