Merge remote-tracking branches 'asoc/topic/pxa', 'asoc/topic/qcom' and 'asoc/topic...

[karo-tx-linux.git] / include / linux / types.h

diff --git a/include/linux/types.h b/include/linux/types.h
index d501ad3ba2478c6ef23e01c3449bb129c5b181aa..1e7bd24848fcb54cae26bdd10597f6ea80afd46f 100644 (file)
--- a/include/linux/types.h
+++ b/include/linux/types.h
@@ -228,8 +228,5 @@ struct callback_head {
 typedef void (*rcu_callback_t)(struct rcu_head *head);
 typedef void (*call_rcu_func_t)(struct rcu_head *head, rcu_callback_t func);
 
-/* clocksource cycle base type */
-typedef u64 cycle_t;
-
 #endif /*  __ASSEMBLY__ */
 #endif /* _LINUX_TYPES_H */