Merge branch 'master' of git://www.denx.de/git/u-boot-cfi-flash

[u-boot] / arch / powerpc / include / asm / ppc4xx.h

diff --git a/arch/powerpc/include/asm/ppc4xx.h b/arch/powerpc/include/asm/ppc4xx.h
index 15be343a684a837f09655f4a8090d92d2a42a607..9f2a08b8b3cd79630f8dc030f0e4e0142c208d2a 100644 (file)
--- a/arch/powerpc/include/asm/ppc4xx.h
+++ b/arch/powerpc/include/asm/ppc4xx.h
@@ -79,12 +79,8 @@
 #include <asm/ppc460sx.h>
 #endif
 
-/*
- * Configure which SDRAM/DDR/DDR2 controller is equipped
- */
-// test-only: what to do with these???
-#if defined(CONFIG_AP1000) || defined(CONFIG_ML2)
-#define CONFIG_SDRAM_PPC4xx_IBM_SDRAM  /* IBM SDRAM controller */
+#if defined(CONFIG_APM821XX)
+#include <asm/apm821xx.h>
 #endif
 
 /*