Merge branch 'master' into csb1725

[mv-sheeva.git] / arch / m68knommu / platform / 68328 / head-de2.S

diff --git a/arch/m68knommu/platform/68328/head-de2.S b/arch/m68knommu/platform/68328/head-de2.S
index 92d96456d3635c9118d8041fb04d948e57839227..f632fdcb93e913b218b7e5a7743d089ac0f8172f 100644 (file)
--- a/arch/m68knommu/platform/68328/head-de2.S
+++ b/arch/m68knommu/platform/68328/head-de2.S
@@ -1,11 +1,5 @@
 
-#if defined(CONFIG_RAM32MB)
-#define        MEM_END 0x02000000      /* Memory size 32Mb */
-#elif defined(CONFIG_RAM16MB)
-#define        MEM_END 0x01000000      /* Memory size 16Mb */
-#else
 #define        MEM_END 0x00800000      /* Memory size 8Mb */
-#endif
 
 #undef CRT_DEBUG