-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
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>
- Loading branch information
Alessandro Rubini
authored and
Russell King
committed
Jun 28, 2012
1 parent
f8f5701
commit dccd230
Showing
2 changed files
with
49 additions
and
47 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,47 +1,2 @@ | ||
| /* | ||
| * linux/include/asm-generic/sizes.h | ||
| * | ||
| * This program is free software; you can redistribute it and/or modify | ||
| * it under the terms of the GNU General Public License version 2 as | ||
| * published by the Free Software Foundation. | ||
| */ | ||
| #ifndef __ASM_GENERIC_SIZES_H__ | ||
| #define __ASM_GENERIC_SIZES_H__ | ||
|
|
||
| #define SZ_1 0x00000001 | ||
| #define SZ_2 0x00000002 | ||
| #define SZ_4 0x00000004 | ||
| #define SZ_8 0x00000008 | ||
| #define SZ_16 0x00000010 | ||
| #define SZ_32 0x00000020 | ||
| #define SZ_64 0x00000040 | ||
| #define SZ_128 0x00000080 | ||
| #define SZ_256 0x00000100 | ||
| #define SZ_512 0x00000200 | ||
|
|
||
| #define SZ_1K 0x00000400 | ||
| #define SZ_2K 0x00000800 | ||
| #define SZ_4K 0x00001000 | ||
| #define SZ_8K 0x00002000 | ||
| #define SZ_16K 0x00004000 | ||
| #define SZ_32K 0x00008000 | ||
| #define SZ_64K 0x00010000 | ||
| #define SZ_128K 0x00020000 | ||
| #define SZ_256K 0x00040000 | ||
| #define SZ_512K 0x00080000 | ||
|
|
||
| #define SZ_1M 0x00100000 | ||
| #define SZ_2M 0x00200000 | ||
| #define SZ_4M 0x00400000 | ||
| #define SZ_8M 0x00800000 | ||
| #define SZ_16M 0x01000000 | ||
| #define SZ_32M 0x02000000 | ||
| #define SZ_64M 0x04000000 | ||
| #define SZ_128M 0x08000000 | ||
| #define SZ_256M 0x10000000 | ||
| #define SZ_512M 0x20000000 | ||
|
|
||
| #define SZ_1G 0x40000000 | ||
| #define SZ_2G 0x80000000 | ||
|
|
||
| #endif /* __ASM_GENERIC_SIZES_H__ */ | ||
| /* This is a placeholder, to be removed over time */ | ||
| #include <linux/sizes.h> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,47 @@ | ||
| /* | ||
| * include/linux/sizes.h | ||
| * | ||
| * This program is free software; you can redistribute it and/or modify | ||
| * it under the terms of the GNU General Public License version 2 as | ||
| * published by the Free Software Foundation. | ||
| */ | ||
| #ifndef __LINUX_SIZES_H__ | ||
| #define __LINUX_SIZES_H__ | ||
|
|
||
| #define SZ_1 0x00000001 | ||
| #define SZ_2 0x00000002 | ||
| #define SZ_4 0x00000004 | ||
| #define SZ_8 0x00000008 | ||
| #define SZ_16 0x00000010 | ||
| #define SZ_32 0x00000020 | ||
| #define SZ_64 0x00000040 | ||
| #define SZ_128 0x00000080 | ||
| #define SZ_256 0x00000100 | ||
| #define SZ_512 0x00000200 | ||
|
|
||
| #define SZ_1K 0x00000400 | ||
| #define SZ_2K 0x00000800 | ||
| #define SZ_4K 0x00001000 | ||
| #define SZ_8K 0x00002000 | ||
| #define SZ_16K 0x00004000 | ||
| #define SZ_32K 0x00008000 | ||
| #define SZ_64K 0x00010000 | ||
| #define SZ_128K 0x00020000 | ||
| #define SZ_256K 0x00040000 | ||
| #define SZ_512K 0x00080000 | ||
|
|
||
| #define SZ_1M 0x00100000 | ||
| #define SZ_2M 0x00200000 | ||
| #define SZ_4M 0x00400000 | ||
| #define SZ_8M 0x00800000 | ||
| #define SZ_16M 0x01000000 | ||
| #define SZ_32M 0x02000000 | ||
| #define SZ_64M 0x04000000 | ||
| #define SZ_128M 0x08000000 | ||
| #define SZ_256M 0x10000000 | ||
| #define SZ_512M 0x20000000 | ||
|
|
||
| #define SZ_1G 0x40000000 | ||
| #define SZ_2G 0x80000000 | ||
|
|
||
| #endif /* __LINUX_SIZES_H__ */ |