diff options
| author | Wolfgang Denk <wd@denx.de> | 2011-02-09 20:50:26 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2011-02-09 20:50:26 +0100 |
| commit | fced09ae386d1aa7fcfdf9111c99da4be56e5b43 (patch) | |
| tree | a6915b1f18aa1ec47e757ea745384869e2b891ef /arch | |
| parent | 8d4addc3c3fe1a9ea160a5a1a20a1f934ff3fe97 (diff) | |
| parent | 2da0fc0d0fcdd991220cc120e5bc6d44991a5987 (diff) | |
| download | blackbird-obmc-uboot-fced09ae386d1aa7fcfdf9111c99da4be56e5b43.tar.gz blackbird-obmc-uboot-fced09ae386d1aa7fcfdf9111c99da4be56e5b43.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-ppc4xx
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/powerpc/include/asm/global_data.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/powerpc/include/asm/global_data.h b/arch/powerpc/include/asm/global_data.h index 2e218de0b7..a33ca2f7b7 100644 --- a/arch/powerpc/include/asm/global_data.h +++ b/arch/powerpc/include/asm/global_data.h @@ -172,6 +172,9 @@ typedef struct global_data { #if defined(CONFIG_LWMON) || defined(CONFIG_LWMON5) unsigned long kbd_status; #endif +#ifdef CONFIG_SYS_FPGA_COUNT + unsigned fpga_state[CONFIG_SYS_FPGA_COUNT]; +#endif #if defined(CONFIG_WD_MAX_RATE) unsigned long long wdt_last; /* trace watch-dog triggering rate */ #endif |
