Commit 3d3934c3 authored by eric miao's avatar eric miao Committed by Russell King

[ARM] pxa: move ARRAY_AND_SIZE definition to generic.h

for use by other platforms
Signed-off-by: default avatareric miao <eric.miao@marvell.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 7facc2f9
...@@ -29,6 +29,8 @@ extern int pxa_last_gpio; ...@@ -29,6 +29,8 @@ extern int pxa_last_gpio;
mi->bank[__nr].size = (__size), \ mi->bank[__nr].size = (__size), \
mi->bank[__nr].node = (((unsigned)(__start) - PHYS_OFFSET) >> 27) mi->bank[__nr].node = (((unsigned)(__start) - PHYS_OFFSET) >> 27)
#define ARRAY_AND_SIZE(x) (x), ARRAY_SIZE(x)
#ifdef CONFIG_PXA25x #ifdef CONFIG_PXA25x
extern unsigned pxa25x_get_clk_frequency_khz(int); extern unsigned pxa25x_get_clk_frequency_khz(int);
extern unsigned pxa25x_get_memclk_frequency_10khz(void); extern unsigned pxa25x_get_memclk_frequency_10khz(void);
......
...@@ -41,8 +41,6 @@ ...@@ -41,8 +41,6 @@
#include "generic.h" #include "generic.h"
#define ARRAY_AND_SIZE(x) (x), ARRAY_SIZE(x)
/* Littleton MFP configurations */ /* Littleton MFP configurations */
static mfp_cfg_t littleton_mfp_cfg[] __initdata = { static mfp_cfg_t littleton_mfp_cfg[] __initdata = {
/* LCD */ /* LCD */
......
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
#include <asm/arch/mfp-pxa300.h> #include <asm/arch/mfp-pxa300.h>
#include <asm/arch/zylonite.h> #include <asm/arch/zylonite.h>
#define ARRAY_AND_SIZE(x) (x), ARRAY_SIZE(x) #include "generic.h"
/* PXA300/PXA310 common configurations */ /* PXA300/PXA310 common configurations */
static mfp_cfg_t common_mfp_cfg[] __initdata = { static mfp_cfg_t common_mfp_cfg[] __initdata = {
......
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
#include <asm/arch/mfp-pxa320.h> #include <asm/arch/mfp-pxa320.h>
#include <asm/arch/zylonite.h> #include <asm/arch/zylonite.h>
#define ARRAY_AND_SIZE(x) (x), ARRAY_SIZE(x) #include "generic.h"
static mfp_cfg_t mfp_cfg[] __initdata = { static mfp_cfg_t mfp_cfg[] __initdata = {
/* LCD */ /* LCD */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment