aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Victor <andrew@sanpeople.com>2007-05-11 15:09:41 -0400
committerRussell King <rmk+kernel@arm.linux.org.uk>2007-05-11 16:07:58 -0400
commit54cb128037de499ea81626b0f37f9bb90e8db3d3 (patch)
tree26cedd628b87e0fe3c36dcbbcf39fc016bd044b4
parent877d7720f5f67793b9b6027840d2c88ea25dc4c8 (diff)
[ARM] 4372/1: Define byte sizes in asm-arm/sizes.h
Define SZ_512, SZ_256 and SZ_16 in asm-arm/sizes.h. Remove the definitions from the at91*_devices.c files. (Dependent on ARM patch #4370/2) Signed-off-by: Andrew Victor <andrew@sanpeople.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
-rw-r--r--arch/arm/mach-at91/at91rm9200_devices.c3
-rw-r--r--arch/arm/mach-at91/at91sam9260_devices.c3
-rw-r--r--arch/arm/mach-at91/at91sam9261_devices.c3
-rw-r--r--arch/arm/mach-at91/at91sam9263_devices.c3
-rw-r--r--arch/arm/mach-at91/at91sam9rl_devices.c4
-rw-r--r--include/asm-arm/sizes.h4
6 files changed, 4 insertions, 16 deletions
diff --git a/arch/arm/mach-at91/at91rm9200_devices.c b/arch/arm/mach-at91/at91rm9200_devices.c
index 2624a4f22d61..70599bcf451c 100644
--- a/arch/arm/mach-at91/at91rm9200_devices.c
+++ b/arch/arm/mach-at91/at91rm9200_devices.c
@@ -22,9 +22,6 @@
22 22
23#include "generic.h" 23#include "generic.h"
24 24
25#define SZ_512 0x00000200
26#define SZ_256 0x00000100
27#define SZ_16 0x00000010
28 25
29/* -------------------------------------------------------------------- 26/* --------------------------------------------------------------------
30 * USB Host 27 * USB Host
diff --git a/arch/arm/mach-at91/at91sam9260_devices.c b/arch/arm/mach-at91/at91sam9260_devices.c
index 40586e22cd38..ffd3154c1e54 100644
--- a/arch/arm/mach-at91/at91sam9260_devices.c
+++ b/arch/arm/mach-at91/at91sam9260_devices.c
@@ -22,9 +22,6 @@
22 22
23#include "generic.h" 23#include "generic.h"
24 24
25#define SZ_512 0x00000200
26#define SZ_256 0x00000100
27#define SZ_16 0x00000010
28 25
29/* -------------------------------------------------------------------- 26/* --------------------------------------------------------------------
30 * USB Host 27 * USB Host
diff --git a/arch/arm/mach-at91/at91sam9261_devices.c b/arch/arm/mach-at91/at91sam9261_devices.c
index 8e781997716a..9db58da04754 100644
--- a/arch/arm/mach-at91/at91sam9261_devices.c
+++ b/arch/arm/mach-at91/at91sam9261_devices.c
@@ -23,9 +23,6 @@
23 23
24#include "generic.h" 24#include "generic.h"
25 25
26#define SZ_512 0x00000200
27#define SZ_256 0x00000100
28#define SZ_16 0x00000010
29 26
30/* -------------------------------------------------------------------- 27/* --------------------------------------------------------------------
31 * USB Host 28 * USB Host
diff --git a/arch/arm/mach-at91/at91sam9263_devices.c b/arch/arm/mach-at91/at91sam9263_devices.c
index 2b2e18a67128..635695787f91 100644
--- a/arch/arm/mach-at91/at91sam9263_devices.c
+++ b/arch/arm/mach-at91/at91sam9263_devices.c
@@ -22,9 +22,6 @@
22 22
23#include "generic.h" 23#include "generic.h"
24 24
25#define SZ_512 0x00000200
26#define SZ_256 0x00000100
27#define SZ_16 0x00000010
28 25
29/* -------------------------------------------------------------------- 26/* --------------------------------------------------------------------
30 * USB Host 27 * USB Host
diff --git a/arch/arm/mach-at91/at91sam9rl_devices.c b/arch/arm/mach-at91/at91sam9rl_devices.c
index e775aa65bb63..cd7532bcd4e5 100644
--- a/arch/arm/mach-at91/at91sam9rl_devices.c
+++ b/arch/arm/mach-at91/at91sam9rl_devices.c
@@ -22,10 +22,6 @@
22 22
23#include "generic.h" 23#include "generic.h"
24 24
25#define SZ_512 0x00000200
26#define SZ_256 0x00000100
27#define SZ_16 0x00000010
28
29 25
30/* -------------------------------------------------------------------- 26/* --------------------------------------------------------------------
31 * MMC / SD 27 * MMC / SD
diff --git a/include/asm-arm/sizes.h b/include/asm-arm/sizes.h
index 7f50ae0edf1b..503843db1565 100644
--- a/include/asm-arm/sizes.h
+++ b/include/asm-arm/sizes.h
@@ -24,6 +24,10 @@
24#define __sizes_h 1 24#define __sizes_h 1
25 25
26/* handy sizes */ 26/* handy sizes */
27#define SZ_16 0x00000010
28#define SZ_256 0x00000100
29#define SZ_512 0x00000200
30
27#define SZ_1K 0x00000400 31#define SZ_1K 0x00000400
28#define SZ_4K 0x00001000 32#define SZ_4K 0x00001000
29#define SZ_8K 0x00002000 33#define SZ_8K 0x00002000