diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-21 19:00:05 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-21 19:00:05 -0800 |
| commit | 66b5920f61b020fc2fc34fef9c4fcdd86df3b52e (patch) | |
| tree | f516e0e9c9579aa30515b2ff23242871fe503a6f /arch | |
| parent | 49bd96c2caa3f02a9273d31b96e75b7574af8c06 (diff) | |
| parent | 9b73fcf85f65a301107c89e05227cd6fd6965680 (diff) | |
| download | op-kernel-dev-66b5920f61b020fc2fc34fef9c4fcdd86df3b52e.zip op-kernel-dev-66b5920f61b020fc2fc34fef9c4fcdd86df3b52e.tar.gz | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-clps7500/core.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-pxa/tosa.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-sa1100/assabet.c | 3 |
3 files changed, 4 insertions, 3 deletions
diff --git a/arch/arm/mach-clps7500/core.c b/arch/arm/mach-clps7500/core.c index 0364ba4..d869af0 100644 --- a/arch/arm/mach-clps7500/core.c +++ b/arch/arm/mach-clps7500/core.c @@ -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 diff --git a/arch/arm/mach-pxa/tosa.c b/arch/arm/mach-pxa/tosa.c index c312054..e4f92ef 100644 --- a/arch/arm/mach-pxa/tosa.c +++ b/arch/arm/mach-pxa/tosa.c @@ -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> diff --git a/arch/arm/mach-sa1100/assabet.c b/arch/arm/mach-sa1100/assabet.c index 75efb5d..a66ac61 100644 --- a/arch/arm/mach-sa1100/assabet.c +++ b/arch/arm/mach-sa1100/assabet.c @@ -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; |
