diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-03-17 19:51:52 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-03-17 19:51:52 -0400 |
| commit | 05d9881bc4c6f172997b7a59e4a1a95910c4ebd7 (patch) | |
| tree | be1f4df97a174489dc4b7c6bcfed2995751e38c7 /arch/arm/include | |
| parent | 3879f5d6f03b66626af014cbb6071ad4d79b1c42 (diff) | |
| parent | 7f3ccb5a22c945916390a9bd7101d0f553fa0fbd (diff) | |
Merge branch 'for-russell' of git://git.kernel.org/pub/scm/linux/kernel/git/chris/linux-2.6 into devel
Diffstat (limited to 'arch/arm/include')
| -rw-r--r-- | arch/arm/include/asm/sizes.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/include/asm/sizes.h b/arch/arm/include/asm/sizes.h index 503843db1565..c10d1aa4b487 100644 --- a/arch/arm/include/asm/sizes.h +++ b/arch/arm/include/asm/sizes.h | |||
| @@ -43,6 +43,7 @@ | |||
| 43 | #define SZ_8M 0x00800000 | 43 | #define SZ_8M 0x00800000 |
| 44 | #define SZ_16M 0x01000000 | 44 | #define SZ_16M 0x01000000 |
| 45 | #define SZ_32M 0x02000000 | 45 | #define SZ_32M 0x02000000 |
| 46 | #define SZ_48M 0x03000000 | ||
| 46 | #define SZ_64M 0x04000000 | 47 | #define SZ_64M 0x04000000 |
| 47 | #define SZ_128M 0x08000000 | 48 | #define SZ_128M 0x08000000 |
| 48 | #define SZ_256M 0x10000000 | 49 | #define SZ_256M 0x10000000 |