aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Miao <eric.miao@linaro.org>2011-12-02 19:37:19 +0800
committerEric Miao <eric.miao@linaro.org>2011-12-02 20:26:28 +0800
commit0172b285a44698c8a5fb821033b51ca97314b0ba (patch)
treec6c5a6db5ca772b9e3c6cbc3e63154beae81106c
parent35bc5fbeec494687bfc40faf25bfa380cb17906a (diff)
downloadlinux-linaro-0172b285a44698c8a5fb821033b51ca97314b0ba.tar.gz
SAUCE: fix building errors of arch/arm/plat-mxc/lluart.c
CC arch/arm/mach-imx/lluart.o In file included from linux-linaro/arch/arm/plat-mxc/include/mach/hardware.h:108:0, from linux-linaro/arch/arm/mach-imx/lluart.c:17: linux-linaro/arch/arm/plat-mxc/include/mach/mxc.h:214:33: warning: ‘enum mxc_cpu_pwr_mode’ declared inside parameter list [enabled by default] linux-linaro/arch/arm/plat-mxc/include/mach/mxc.h:214:33: warning: its scope is only this definition or declaration, which is probably not what you want [enabled by default] linux-linaro/arch/arm/mach-imx/lluart.c: In function ‘imx_lluart_map_io’: linux-linaro/arch/arm/mach-imx/lluart.c:39:21: error: request for member ‘virtual’ in something not a structure or union linux-linaro/arch/arm/mach-imx/lluart.c:40:3: error: implicit declaration of function ‘ARRY_SIZE’ [-Werror=implicit-function-declaration] linux-linaro/arch/arm/mach-imx/lluart.c:40:3: warning: passing argument 1 of ‘iotable_init’ from incompatible pointer type [enabled by default] linux-linaro/arch/arm/include/asm/mach/map.h:35:13: note: expected ‘struct map_desc *’ but argument is of type ‘struct map_desc (*)[2]’ cc1: some warnings being treated as errors make[2]: *** [arch/arm/mach-imx/lluart.o] Error 1 make[1]: *** [arch/arm/mach-imx] Error 2 make: *** [sub-make] Error 2 Signed-off-by: Eric Miao <eric.miao@linaro.org>
-rw-r--r--arch/arm/mach-imx/lluart.c5
-rw-r--r--arch/arm/plat-mxc/include/mach/mxc.h2
2 files changed, 5 insertions, 2 deletions
diff --git a/arch/arm/mach-imx/lluart.c b/arch/arm/mach-imx/lluart.c
index 8962dfff901..eb74a412416 100644
--- a/arch/arm/mach-imx/lluart.c
+++ b/arch/arm/mach-imx/lluart.c
@@ -11,6 +11,7 @@
*/
#include <linux/init.h>
+#include <linux/kernel.h>
#include <asm/page.h>
#include <asm/sizes.h>
#include <asm/mach/map.h>
@@ -36,6 +37,6 @@ static struct map_desc imx_lluart_desc[] = {
void __init imx_lluart_map_io(void)
{
- if (imx_lluart_desc.virtual)
- iotable_init(&imx_lluart_desc, ARRY_SIZE(imx_lluart_desc));
+ if (ARRAY_SIZE(imx_lluart_desc))
+ iotable_init(imx_lluart_desc, ARRAY_SIZE(imx_lluart_desc));
}
diff --git a/arch/arm/plat-mxc/include/mach/mxc.h b/arch/arm/plat-mxc/include/mach/mxc.h
index 7a76a7e8843..eb49d7114ca 100644
--- a/arch/arm/plat-mxc/include/mach/mxc.h
+++ b/arch/arm/plat-mxc/include/mach/mxc.h
@@ -196,6 +196,8 @@ extern unsigned int __mxc_cpu_type;
#ifndef __ASSEMBLY__
+#include <mach/common.h>
+
struct cpu_op {
u32 pll_reg;
u32 pll_rate;