Merge with /home/wd/git/u-boot/custodian/u-boot-net

[oweals/u-boot.git] / include / asm-avr32 / global_data.h

diff --git a/include/asm-avr32/global_data.h b/include/asm-avr32/global_data.h
index 01d836c6395a07d7922eb44a19b1f0e4dbc0428e..681c514ccf45d962abd5e5a10c44a8b282581673 100644 (file)
--- a/include/asm-avr32/global_data.h
+++ b/include/asm-avr32/global_data.h
@@ -35,10 +35,8 @@
 typedef        struct  global_data {
        bd_t            *bd;
        unsigned long   flags;
-       const struct device     *console_uart;
-       const struct device     *sm;
        unsigned long   baudrate;
-       unsigned long   sdram_size;
+       unsigned long   stack_end;      /* highest stack address */
        unsigned long   have_console;   /* serial_init() was called */
        unsigned long   reloc_off;      /* Relocation Offset */
        unsigned long   env_addr;       /* Address of env struct */