diff options
author | eric miao <eric.miao@marvell.com> | 2008-02-03 02:49:09 -0500 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-04-19 06:29:04 -0400 |
commit | 3d3934c357103504d0f0a5e9ab808bb57e356f6a (patch) | |
tree | c5b2dc3b2c6e028aab06fe087b2e20d3e961f4f4 /arch/arm | |
parent | 7facc2f9374159795af2a3f8b3e682b4ee230643 (diff) |
[ARM] pxa: move ARRAY_AND_SIZE definition to generic.h
for use by other platforms
Signed-off-by: eric miao <eric.miao@marvell.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/mach-pxa/generic.h | 2 | ||||
-rw-r--r-- | arch/arm/mach-pxa/littleton.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-pxa/zylonite_pxa300.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-pxa/zylonite_pxa320.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-pxa/generic.h b/arch/arm/mach-pxa/generic.h index 8bca89c4a256..5bb7ae757831 100644 --- a/arch/arm/mach-pxa/generic.h +++ b/arch/arm/mach-pxa/generic.h | |||
@@ -29,6 +29,8 @@ extern int pxa_last_gpio; | |||
29 | mi->bank[__nr].size = (__size), \ | 29 | mi->bank[__nr].size = (__size), \ |
30 | mi->bank[__nr].node = (((unsigned)(__start) - PHYS_OFFSET) >> 27) | 30 | mi->bank[__nr].node = (((unsigned)(__start) - PHYS_OFFSET) >> 27) |
31 | 31 | ||
32 | #define ARRAY_AND_SIZE(x) (x), ARRAY_SIZE(x) | ||
33 | |||
32 | #ifdef CONFIG_PXA25x | 34 | #ifdef CONFIG_PXA25x |
33 | extern unsigned pxa25x_get_clk_frequency_khz(int); | 35 | extern unsigned pxa25x_get_clk_frequency_khz(int); |
34 | extern unsigned pxa25x_get_memclk_frequency_10khz(void); | 36 | extern unsigned pxa25x_get_memclk_frequency_10khz(void); |
diff --git a/arch/arm/mach-pxa/littleton.c b/arch/arm/mach-pxa/littleton.c index 0a4b54c21314..cdf22d4add25 100644 --- a/arch/arm/mach-pxa/littleton.c +++ b/arch/arm/mach-pxa/littleton.c | |||
@@ -41,8 +41,6 @@ | |||
41 | 41 | ||
42 | #include "generic.h" | 42 | #include "generic.h" |
43 | 43 | ||
44 | #define ARRAY_AND_SIZE(x) (x), ARRAY_SIZE(x) | ||
45 | |||
46 | /* Littleton MFP configurations */ | 44 | /* Littleton MFP configurations */ |
47 | static mfp_cfg_t littleton_mfp_cfg[] __initdata = { | 45 | static mfp_cfg_t littleton_mfp_cfg[] __initdata = { |
48 | /* LCD */ | 46 | /* LCD */ |
diff --git a/arch/arm/mach-pxa/zylonite_pxa300.c b/arch/arm/mach-pxa/zylonite_pxa300.c index 6ac04c09b0e9..b3e3049486aa 100644 --- a/arch/arm/mach-pxa/zylonite_pxa300.c +++ b/arch/arm/mach-pxa/zylonite_pxa300.c | |||
@@ -21,7 +21,7 @@ | |||
21 | #include <asm/arch/mfp-pxa300.h> | 21 | #include <asm/arch/mfp-pxa300.h> |
22 | #include <asm/arch/zylonite.h> | 22 | #include <asm/arch/zylonite.h> |
23 | 23 | ||
24 | #define ARRAY_AND_SIZE(x) (x), ARRAY_SIZE(x) | 24 | #include "generic.h" |
25 | 25 | ||
26 | /* PXA300/PXA310 common configurations */ | 26 | /* PXA300/PXA310 common configurations */ |
27 | static mfp_cfg_t common_mfp_cfg[] __initdata = { | 27 | static mfp_cfg_t common_mfp_cfg[] __initdata = { |
diff --git a/arch/arm/mach-pxa/zylonite_pxa320.c b/arch/arm/mach-pxa/zylonite_pxa320.c index dfa79992b8ab..ce54195a4546 100644 --- a/arch/arm/mach-pxa/zylonite_pxa320.c +++ b/arch/arm/mach-pxa/zylonite_pxa320.c | |||
@@ -21,7 +21,7 @@ | |||
21 | #include <asm/arch/mfp-pxa320.h> | 21 | #include <asm/arch/mfp-pxa320.h> |
22 | #include <asm/arch/zylonite.h> | 22 | #include <asm/arch/zylonite.h> |
23 | 23 | ||
24 | #define ARRAY_AND_SIZE(x) (x), ARRAY_SIZE(x) | 24 | #include "generic.h" |
25 | 25 | ||
26 | static mfp_cfg_t mfp_cfg[] __initdata = { | 26 | static mfp_cfg_t mfp_cfg[] __initdata = { |
27 | /* LCD */ | 27 | /* LCD */ |