From 43dbec535f8584bde15eb4e093ec0f088fb61b84 Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Thu, 19 Jul 2012 17:47:44 -0700
Subject: [PATCH] --- yaml --- r: 318142 b: refs/heads/master c:
 3421ee2f84488e9c03fb7ddfcd60bc30796678c8 h: refs/heads/master v: v3

---
 [refs]                                |  2 +-
 trunk/drivers/staging/csr/oska/time.h | 34 ---------------------------
 2 files changed, 1 insertion(+), 35 deletions(-)
 delete mode 100644 trunk/drivers/staging/csr/oska/time.h

diff --git a/[refs] b/[refs]
index b3b4d93fc485..3b012c9fce91 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fa335388d936a56935aaa101d73a799da9271c11
+refs/heads/master: 3421ee2f84488e9c03fb7ddfcd60bc30796678c8
diff --git a/trunk/drivers/staging/csr/oska/time.h b/trunk/drivers/staging/csr/oska/time.h
deleted file mode 100644
index d246ce937309..000000000000
--- a/trunk/drivers/staging/csr/oska/time.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * OSKA Linux implementation -- timing
- *
- * Copyright (C) 2007 Cambridge Silicon Radio Ltd.
- *
- * Refer to LICENSE.txt included with this source code for details on
- * the license terms.
- */
-#ifndef __OSKA_LINUX_TIME_H
-#define __OSKA_LINUX_TIME_H
-
-#include <linux/kernel.h>
-#include <linux/time.h>
-#include <linux/delay.h>
-#include <linux/jiffies.h>
-
-static inline unsigned long os_current_time_ms(void)
-{
-    return jiffies_to_msecs(jiffies);
-}
-
-static inline void os_sleep_ms(unsigned ms)
-{
-    msleep_interruptible(ms);
-}
-
-static inline void os_delay_us(unsigned us)
-{
-    udelay(us);
-}
-
-#define os_time_after(a, b) time_after((a), (b))
-
-#endif /* __OSKA_LINUX_TIME_H */