Merge branch 'master' of git://git.denx.de/u-boot-arm

[karo-tx-uboot.git] / include / asm-ppc / global_data.h

diff --git a/include/asm-ppc/global_data.h b/include/asm-ppc/global_data.h
index 3f119187464fc0696596c9022cfd46c0d81654ea..d3dd44e96d7bdff3d1e1f75e53e304266190dc3c 100644 (file)
--- a/include/asm-ppc/global_data.h
+++ b/include/asm-ppc/global_data.h
@@ -152,9 +152,7 @@ typedef     struct  global_data {
     defined(CONFIG_SANDPOINT)
        void *          console_addr;
 #endif
-#ifdef CONFIG_AMIGAONEG3SE
        unsigned long   relocaddr;      /* Start address of U-Boot in RAM */
-#endif
 #if defined(CONFIG_LCD) || defined(CONFIG_VIDEO)
        unsigned long   fb_base;        /* Base address of framebuffer memory   */
 #endif