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

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

diff --git a/arch/arm/include/asm/global_data.h b/arch/arm/include/asm/global_data.h
index c1a59f2c938d181a813b1762018e11869508c0d8..ef9959e6eefc53144707026f2e4c7df7bdd3a5f5 100644 (file)
--- a/arch/arm/include/asm/global_data.h
+++ b/arch/arm/include/asm/global_data.h
@@ -41,9 +41,6 @@ typedef       struct  global_data {
        unsigned long   env_addr;       /* Address  of Environment struct */
        unsigned long   env_valid;      /* Checksum of Environment valid? */
        unsigned long   fb_base;        /* base address of frame buffer */
-#ifdef CONFIG_VFD
-       unsigned char   vfd_type;       /* display type */
-#endif
 #ifdef CONFIG_FSL_ESDHC
        unsigned long   sdhc_clk;
 #endif