Merge branch 'master' into next

[platform/kernel/u-boot.git] / include / asm-generic / global_data.h

diff --git a/include/asm-generic/global_data.h b/include/asm-generic/global_data.h
index 2a747d9..4aeb61f 100644 (file)
--- a/include/asm-generic/global_data.h
+++ b/include/asm-generic/global_data.h
@@ -20,6 +20,7 @@
  */
 
 #ifndef __ASSEMBLY__
+#include <cyclic.h>
 #include <event_internal.h>
 #include <fdtdec.h>
 #include <membuff.h>
@@ -478,6 +479,12 @@ struct global_data {
         */
        struct event_state event_state;
 #endif
+#ifdef CONFIG_CYCLIC
+       /**
+        * @cyclic: cyclic driver data
+        */
+       struct cyclic_drv *cyclic;
+#endif
        /**
         * @dmtag_list: List of DM tags
         */