From 914301982f38e5842b28fd2f708208ea456b346a Mon Sep 17 00:00:00 2001 From: Matt Reimer Date: Thu, 25 Oct 2007 19:06:44 +0100 Subject: [ARM] 4632/1: Fix a typo in include/asm-arm/plat-s3c/regs-nand.h Fix a typo in include/asm-arm/plat-s3c/regs-nand.h. Signed-off-by: Matt Reimer Acked-by: Ben Dooks Signed-off-by: Russell King --- include/asm-arm/plat-s3c/regs-nand.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include') diff --git a/include/asm-arm/plat-s3c/regs-nand.h b/include/asm-arm/plat-s3c/regs-nand.h index b824d371ae0..d742205ac17 100644 --- a/include/asm-arm/plat-s3c/regs-nand.h +++ b/include/asm-arm/plat-s3c/regs-nand.h @@ -35,7 +35,7 @@ #define S3C2440_NFESTAT1 S3C2410_NFREG(0x28) #define S3C2440_NFMECC0 S3C2410_NFREG(0x2C) #define S3C2440_NFMECC1 S3C2410_NFREG(0x30) -#define S3C2440_NFSECC S3C24E10_NFREG(0x34) +#define S3C2440_NFSECC S3C2410_NFREG(0x34) #define S3C2440_NFSBLK S3C2410_NFREG(0x38) #define S3C2440_NFEBLK S3C2410_NFREG(0x3C) -- cgit v1.2.3 From a80770ce4d8e0e83a32298453c0a8e78444f8184 Mon Sep 17 00:00:00 2001 From: Russell King Date: Fri, 26 Oct 2007 17:54:39 +0100 Subject: [ARM] Fix ateb9200_defconfig build regression Fix: CC drivers/serial/atmel_serial.o drivers/serial/atmel_serial.c: In function 'atmel_serial_suspend': drivers/serial/atmel_serial.c:924: error: implicit declaration of function 'at91_suspend_entering_slow_clock' Acked-by: Andrew Victor Signed-off-by: Russell King --- include/asm-arm/arch-at91/board.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'include') diff --git a/include/asm-arm/arch-at91/board.h b/include/asm-arm/arch-at91/board.h index d96b10fd449..c0d7075982c 100644 --- a/include/asm-arm/arch-at91/board.h +++ b/include/asm-arm/arch-at91/board.h @@ -130,4 +130,7 @@ extern u8 at91_leds_cpu; extern u8 at91_leds_timer; extern void __init at91_init_leds(u8 cpu_led, u8 timer_led); +/* FIXME: this needs a better location, but gets stuff building again */ +extern int at91_suspend_entering_slow_clock(void); + #endif -- cgit v1.2.3 From fd3d72859b5fab00aba2e7ce5ca65744f6720769 Mon Sep 17 00:00:00 2001 From: Russell King Date: Sat, 27 Oct 2007 21:48:43 +0100 Subject: [ARM] nommu: fix breakage caused by f9720205d1f847cb59e197e851b5276425363f6b Someone forgot to use 'ls include/asm-*/flat.h' or 'grep -r flat_get_addr_from_rp .' to find all architectures which may be affected by their change. Fix the fall out. Noticed-by: Robert P. J. Day Signed-off-by: Russell King --- include/asm-arm/flat.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'include') diff --git a/include/asm-arm/flat.h b/include/asm-arm/flat.h index 16f5375e57b..9918aa46d9e 100644 --- a/include/asm-arm/flat.h +++ b/include/asm-arm/flat.h @@ -11,8 +11,9 @@ #define flat_argvp_envp_on_stack() 1 #define flat_old_ram_flag(flags) (flags) #define flat_reloc_valid(reloc, size) ((reloc) <= (size)) -#define flat_get_addr_from_rp(rp, relval, flags) get_unaligned(rp) +#define flat_get_addr_from_rp(rp, relval, flags, persistent) get_unaligned(rp) #define flat_put_addr_at_rp(rp, val, relval) put_unaligned(val,rp) #define flat_get_relocate_addr(rel) (rel) +#define flat_set_persistent(relval, p) 0 #endif /* __ARM_FLAT_H__ */ -- cgit v1.2.3 From e9bba8ee6cbb5b8065d42aa9e898cb0d84605c58 Mon Sep 17 00:00:00 2001 From: eric miao Date: Tue, 30 Oct 2007 08:01:38 +0100 Subject: [ARM] 4635/1: pxa: Change Eric Miao's email address to eric.miao@marvell.com Signed-off-by: eric miao Signed-off-by: Russell King --- include/asm-arm/arch-pxa/mfp-pxa300.h | 2 +- include/asm-arm/arch-pxa/mfp-pxa320.h | 2 +- include/asm-arm/arch-pxa/mfp.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'include') diff --git a/include/asm-arm/arch-pxa/mfp-pxa300.h b/include/asm-arm/arch-pxa/mfp-pxa300.h index 7513c7a3402..822a27cd786 100644 --- a/include/asm-arm/arch-pxa/mfp-pxa300.h +++ b/include/asm-arm/arch-pxa/mfp-pxa300.h @@ -4,7 +4,7 @@ * PXA300/PXA310 specific MFP configuration definitions * * Copyright (C) 2007 Marvell International Ltd. - * 2007-08-21: eric miao + * 2007-08-21: eric miao * initial version * * This program is free software; you can redistribute it and/or modify diff --git a/include/asm-arm/arch-pxa/mfp-pxa320.h b/include/asm-arm/arch-pxa/mfp-pxa320.h index ae8ba34194c..488a5bbc49e 100644 --- a/include/asm-arm/arch-pxa/mfp-pxa320.h +++ b/include/asm-arm/arch-pxa/mfp-pxa320.h @@ -4,7 +4,7 @@ * PXA320 specific MFP configuration definitions * * Copyright (C) 2007 Marvell International Ltd. - * 2007-08-21: eric miao + * 2007-08-21: eric miao * initial version * * This program is free software; you can redistribute it and/or modify diff --git a/include/asm-arm/arch-pxa/mfp.h b/include/asm-arm/arch-pxa/mfp.h index 60291742ffd..ac4157af5a8 100644 --- a/include/asm-arm/arch-pxa/mfp.h +++ b/include/asm-arm/arch-pxa/mfp.h @@ -5,7 +5,7 @@ * * Copyright (C) 2007 Marvell International Ltd. * - * 2007-8-21: eric miao + * 2007-8-21: eric miao * initial version * * This program is free software; you can redistribute it and/or modify -- cgit v1.2.3 From 558de8a74efe37a4b5e2ef944da17d23e701dd98 Mon Sep 17 00:00:00 2001 From: David Brownell Date: Tue, 30 Oct 2007 00:15:46 +0100 Subject: [ARM] 4634/1: DaVinci GPIO header build fix This fixes a build problem with GPIOs on DaVinci. Since it inlines operations for on-chip GPIOs, it needs some headers to support those direct register accesses. Those headers won't be included on other platforms, since they don't have that optimization. Signed-off-by: David Brownell Acked-by: Kevin Hilman Signed-off-by: Russell King --- include/asm-arm/arch-davinci/gpio.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'include') diff --git a/include/asm-arm/arch-davinci/gpio.h b/include/asm-arm/arch-davinci/gpio.h index ea24a0e0bfd..ff8de30b2fb 100644 --- a/include/asm-arm/arch-davinci/gpio.h +++ b/include/asm-arm/arch-davinci/gpio.h @@ -13,6 +13,9 @@ #ifndef __DAVINCI_GPIO_H #define __DAVINCI_GPIO_H +#include +#include + /* * basic gpio routines * -- cgit v1.2.3