diff options
| author | Alessandro Rubini <rubini@gnudd.com> | 2012-06-24 07:46:05 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-06-28 12:14:34 -0400 |
| commit | dccd2304cc907c4b4d2920eeb24b055320fe942e (patch) | |
| tree | f5242f8cd7c7ebb396959cdcfc108d15e0f3affe /include | |
| parent | f8f5701bdaf9134b1f90e5044a82c66324d2073f (diff) | |
ARM: 7430/1: sizes.h: move from asm-generic to <linux/sizes.h>
sizes.h is used throughout the AMBA code and drivers, so the header
should be available to everyone in order to driver AMBA/PrimeCell
peripherals behind a PCI bridge where the host can be any platform
(I'm doing it under x86).
At this step <asm-generic/sizes.h> includes <linux/sizes.h>,
to allow a grace period for both in-tree and out-of-tree drivers.
Signed-off-by: Alessandro Rubini <rubini@gnudd.com>
Acked-by: Giancarlo Asnaghi <giancarlo.asnaghi@st.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Cc: Alan Cox <alan@linux.intel.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-generic/sizes.h | 49 | ||||
| -rw-r--r-- | include/linux/sizes.h | 47 |
2 files changed, 49 insertions, 47 deletions
diff --git a/include/asm-generic/sizes.h b/include/asm-generic/sizes.h index ea5d4ef81061..1dcfad9629ef 100644 --- a/include/asm-generic/sizes.h +++ b/include/asm-generic/sizes.h | |||
| @@ -1,47 +1,2 @@ | |||
| 1 | /* | 1 | /* This is a placeholder, to be removed over time */ |
| 2 | * linux/include/asm-generic/sizes.h | 2 | #include <linux/sizes.h> |
| 3 | * | ||
| 4 | * This program is free software; you can redistribute it and/or modify | ||
| 5 | * it under the terms of the GNU General Public License version 2 as | ||
| 6 | * published by the Free Software Foundation. | ||
| 7 | */ | ||
| 8 | #ifndef __ASM_GENERIC_SIZES_H__ | ||
| 9 | #define __ASM_GENERIC_SIZES_H__ | ||
| 10 | |||
| 11 | #define SZ_1 0x00000001 | ||
| 12 | #define SZ_2 0x00000002 | ||
| 13 | #define SZ_4 0x00000004 | ||
| 14 | #define SZ_8 0x00000008 | ||
| 15 | #define SZ_16 0x00000010 | ||
| 16 | #define SZ_32 0x00000020 | ||
| 17 | #define SZ_64 0x00000040 | ||
| 18 | #define SZ_128 0x00000080 | ||
| 19 | #define SZ_256 0x00000100 | ||
| 20 | #define SZ_512 0x00000200 | ||
| 21 | |||
| 22 | #define SZ_1K 0x00000400 | ||
| 23 | #define SZ_2K 0x00000800 | ||
| 24 | #define SZ_4K 0x00001000 | ||
| 25 | #define SZ_8K 0x00002000 | ||
| 26 | #define SZ_16K 0x00004000 | ||
| 27 | #define SZ_32K 0x00008000 | ||
| 28 | #define SZ_64K 0x00010000 | ||
| 29 | #define SZ_128K 0x00020000 | ||
| 30 | #define SZ_256K 0x00040000 | ||
| 31 | #define SZ_512K 0x00080000 | ||
| 32 | |||
| 33 | #define SZ_1M 0x00100000 | ||
| 34 | #define SZ_2M 0x00200000 | ||
| 35 | #define SZ_4M 0x00400000 | ||
| 36 | #define SZ_8M 0x00800000 | ||
| 37 | #define SZ_16M 0x01000000 | ||
| 38 | #define SZ_32M 0x02000000 | ||
| 39 | #define SZ_64M 0x04000000 | ||
| 40 | #define SZ_128M 0x08000000 | ||
| 41 | #define SZ_256M 0x10000000 | ||
| 42 | #define SZ_512M 0x20000000 | ||
| 43 | |||
| 44 | #define SZ_1G 0x40000000 | ||
| 45 | #define SZ_2G 0x80000000 | ||
| 46 | |||
| 47 | #endif /* __ASM_GENERIC_SIZES_H__ */ | ||
diff --git a/include/linux/sizes.h b/include/linux/sizes.h new file mode 100644 index 000000000000..ce3e8150c174 --- /dev/null +++ b/include/linux/sizes.h | |||
| @@ -0,0 +1,47 @@ | |||
| 1 | /* | ||
| 2 | * include/linux/sizes.h | ||
| 3 | * | ||
| 4 | * This program is free software; you can redistribute it and/or modify | ||
| 5 | * it under the terms of the GNU General Public License version 2 as | ||
| 6 | * published by the Free Software Foundation. | ||
| 7 | */ | ||
| 8 | #ifndef __LINUX_SIZES_H__ | ||
| 9 | #define __LINUX_SIZES_H__ | ||
| 10 | |||
| 11 | #define SZ_1 0x00000001 | ||
| 12 | #define SZ_2 0x00000002 | ||
| 13 | #define SZ_4 0x00000004 | ||
| 14 | #define SZ_8 0x00000008 | ||
| 15 | #define SZ_16 0x00000010 | ||
| 16 | #define SZ_32 0x00000020 | ||
| 17 | #define SZ_64 0x00000040 | ||
| 18 | #define SZ_128 0x00000080 | ||
| 19 | #define SZ_256 0x00000100 | ||
| 20 | #define SZ_512 0x00000200 | ||
| 21 | |||
| 22 | #define SZ_1K 0x00000400 | ||
| 23 | #define SZ_2K 0x00000800 | ||
| 24 | #define SZ_4K 0x00001000 | ||
| 25 | #define SZ_8K 0x00002000 | ||
| 26 | #define SZ_16K 0x00004000 | ||
| 27 | #define SZ_32K 0x00008000 | ||
| 28 | #define SZ_64K 0x00010000 | ||
| 29 | #define SZ_128K 0x00020000 | ||
| 30 | #define SZ_256K 0x00040000 | ||
| 31 | #define SZ_512K 0x00080000 | ||
| 32 | |||
| 33 | #define SZ_1M 0x00100000 | ||
| 34 | #define SZ_2M 0x00200000 | ||
| 35 | #define SZ_4M 0x00400000 | ||
| 36 | #define SZ_8M 0x00800000 | ||
| 37 | #define SZ_16M 0x01000000 | ||
| 38 | #define SZ_32M 0x02000000 | ||
| 39 | #define SZ_64M 0x04000000 | ||
| 40 | #define SZ_128M 0x08000000 | ||
| 41 | #define SZ_256M 0x10000000 | ||
| 42 | #define SZ_512M 0x20000000 | ||
| 43 | |||
| 44 | #define SZ_1G 0x40000000 | ||
| 45 | #define SZ_2G 0x80000000 | ||
| 46 | |||
| 47 | #endif /* __LINUX_SIZES_H__ */ | ||