dirty fix to merging

1 files changed, 0 insertions, 50 deletions

diff --git a/ANDROID_3.4.5/include/linux/timerqueue.h b/ANDROID_3.4.5/include/linux/timerqueue.h
deleted file mode 100644
index 50887274..00000000
--- a/ANDROID_3.4.5/include/linux/timerqueue.h
+++ /dev/null
@@ -1,50 +0,0 @@
-#ifndef _LINUX_TIMERQUEUE_H
-#define _LINUX_TIMERQUEUE_H
-
-#include <linux/rbtree.h>
-#include <linux/ktime.h>
-
-
-struct timerqueue_node {
-	struct rb_node node;
-	ktime_t expires;
-};
-
-struct timerqueue_head {
-	struct rb_root head;
-	struct timerqueue_node *next;
-};
-
-
-extern void timerqueue_add(struct timerqueue_head *head,
-				struct timerqueue_node *node);
-extern void timerqueue_del(struct timerqueue_head *head,
-				struct timerqueue_node *node);
-extern struct timerqueue_node *timerqueue_iterate_next(
-						struct timerqueue_node *node);
-
-/**
- * timerqueue_getnext - Returns the timer with the earliest expiration time
- *
- * @head: head of timerqueue
- *
- * Returns a pointer to the timer node that has the
- * earliest expiration time.
- */
-static inline
-struct timerqueue_node *timerqueue_getnext(struct timerqueue_head *head)
-{
-	return head->next;
-}
-
-static inline void timerqueue_init(struct timerqueue_node *node)
-{
-	rb_init_node(&node->node);
-}
-
-static inline void timerqueue_init_head(struct timerqueue_head *head)
-{
-	head->head = RB_ROOT;
-	head->next = NULL;
-}
-#endif /* _LINUX_TIMERQUEUE_H */