summaryrefslogtreecommitdiff
path: root/arch/powerpc
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2011-02-09 20:50:26 +0100
committerWolfgang Denk <wd@denx.de>2011-02-09 20:50:26 +0100
commitfced09ae386d1aa7fcfdf9111c99da4be56e5b43 (patch)
treea6915b1f18aa1ec47e757ea745384869e2b891ef /arch/powerpc
parent8d4addc3c3fe1a9ea160a5a1a20a1f934ff3fe97 (diff)
parent2da0fc0d0fcdd991220cc120e5bc6d44991a5987 (diff)
downloadu-boot-imx-fced09ae386d1aa7fcfdf9111c99da4be56e5b43.zip
u-boot-imx-fced09ae386d1aa7fcfdf9111c99da4be56e5b43.tar.gz
u-boot-imx-fced09ae386d1aa7fcfdf9111c99da4be56e5b43.tar.bz2
Merge branch 'master' of git://git.denx.de/u-boot-ppc4xx
Diffstat (limited to 'arch/powerpc')
-rw-r--r--arch/powerpc/include/asm/global_data.h3
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 2e218de..a33ca2f 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