diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2010-10-30 07:35:11 -0400 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2010-10-30 07:35:11 -0400 |
| commit | 67577927e8d7a1f4b09b4992df640eadc6aacb36 (patch) | |
| tree | 2e9efe6b5745965faf0dcc084d4613d9356263f9 /arch/m68knommu/platform/68328/head-de2.S | |
| parent | 6fe4c590313133ebd5dadb769031489ff178ece1 (diff) | |
| parent | 51f00a471ce8f359627dd99aeac322947a0e491b (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Conflicts:
drivers/mtd/mtd_blkdevs.c
Merge Grant's device-tree bits so that we can apply the subsequent fixes.
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Diffstat (limited to 'arch/m68knommu/platform/68328/head-de2.S')
| -rw-r--r-- | arch/m68knommu/platform/68328/head-de2.S | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/m68knommu/platform/68328/head-de2.S b/arch/m68knommu/platform/68328/head-de2.S index 92d96456d363..f632fdcb93e9 100644 --- a/arch/m68knommu/platform/68328/head-de2.S +++ b/arch/m68knommu/platform/68328/head-de2.S | |||
| @@ -1,11 +1,5 @@ | |||
| 1 | 1 | ||
| 2 | #if defined(CONFIG_RAM32MB) | ||
| 3 | #define MEM_END 0x02000000 /* Memory size 32Mb */ | ||
| 4 | #elif defined(CONFIG_RAM16MB) | ||
| 5 | #define MEM_END 0x01000000 /* Memory size 16Mb */ | ||
| 6 | #else | ||
| 7 | #define MEM_END 0x00800000 /* Memory size 8Mb */ | 2 | #define MEM_END 0x00800000 /* Memory size 8Mb */ |
| 8 | #endif | ||
| 9 | 3 | ||
| 10 | #undef CRT_DEBUG | 4 | #undef CRT_DEBUG |
| 11 | 5 | ||