linkstation: fix warning: "CONFIG_IDENT_STRING" redefined

[karo-tx-uboot.git] / board / linkstation / linkstation.c

diff --git a/board/linkstation/linkstation.c b/board/linkstation/linkstation.c
index afb96ae6ce6804c1c7cd887b2be853694790e3cb..764085691c8ebff9789799249537563c047b6763 100644 (file)
--- a/board/linkstation/linkstation.c
+++ b/board/linkstation/linkstation.c
@@ -21,8 +21,8 @@
  * MA 02111-1307 USA
  */
 
-#include <version.h>
 #include <common.h>
+#include <version.h>
 #include <mpc824x.h>
 #include <asm/io.h>
 #include <ns16550.h>
@@ -32,11 +32,12 @@
 #include <pci.h>
 #endif
 
+DECLARE_GLOBAL_DATA_PTR;
+
 extern void init_AVR_DUART(void);
 
 int checkboard (void)
 {
-       DECLARE_GLOBAL_DATA_PTR;
        char *p;
        bd_t *bd = gd->bd;
 
@@ -53,7 +54,7 @@ int checkboard (void)
 
 phys_size_t initdram (int board_type)
 {
-       return (get_ram_size(CFG_SDRAM_BASE, CFG_MAX_RAM_SIZE));
+       return (get_ram_size(CONFIG_SYS_SDRAM_BASE, CONFIG_SYS_MAX_RAM_SIZE));
 }
 
 /*