From c37b2b684970f68e835329d776e4df22a9dd2b0f Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Thu, 19 Jul 2012 17:35:13 -0700
Subject: [PATCH] --- yaml --- r: 318137 b: refs/heads/master c:
 e74927deee8094e81fc097ba8b73d708eae7ed44 h: refs/heads/master i:   318135:
 22df31437665d730961620d44cb0de6db56c9e69 v: v3

---
 [refs]                               |  2 +-
 trunk/drivers/staging/csr/oska/all.h |  1 -
 trunk/drivers/staging/csr/oska/io.h  | 63 ----------------------------
 3 files changed, 1 insertion(+), 65 deletions(-)
 delete mode 100644 trunk/drivers/staging/csr/oska/io.h

diff --git a/[refs] b/[refs]
index 486e74e9c5d1..0215eb32cf2c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7a72e416e9f44fee263eef4e3c21ac70eb2927dd
+refs/heads/master: e74927deee8094e81fc097ba8b73d708eae7ed44
diff --git a/trunk/drivers/staging/csr/oska/all.h b/trunk/drivers/staging/csr/oska/all.h
index 5fe85834894b..b08bc1fc21cd 100644
--- a/trunk/drivers/staging/csr/oska/all.h
+++ b/trunk/drivers/staging/csr/oska/all.h
@@ -41,7 +41,6 @@
  *
  * There are additional modules that are not included in <oska/all.h>.
  *
- *   - \ref io "Memory mapped I/O" <oska/io.h>
  *   - \ref refcount "Reference Counting" <oska/refcount.h>
  *   - \ref list "Linked lists" <oska/list.h>
  *   - \ref trace "Tracing messages" <oska/trace.h>
diff --git a/trunk/drivers/staging/csr/oska/io.h b/trunk/drivers/staging/csr/oska/io.h
deleted file mode 100644
index c6c406c364b9..000000000000
--- a/trunk/drivers/staging/csr/oska/io.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * OSKA Linux implementation -- memory mapped I/O.
- *
- * Copyright (C) 2009 Cambridge Silicon Radio Ltd.
- *
- * Refer to LICENSE.txt included with this source code for details on
- * the license terms.
- */
-#ifndef __OSKA_LINUX_IO_H
-#define __OSKA_LINUX_IO_H
-
-#include <linux/kernel.h>
-#include <linux/io.h>
-#include <linux/kernel-compat.h>
-
-typedef void __iomem *os_io_mem_t;
-
-static inline uint8_t os_io_read8(os_io_mem_t base, unsigned offset)
-{
-    return readb(base + offset);
-}
-
-static inline uint16_t os_io_read16(os_io_mem_t base, unsigned offset)
-{
-    return readw(base + offset);
-}
-
-static inline uint32_t os_io_read32(os_io_mem_t base, unsigned offset)
-{
-    return readl(base + offset);
-}
-
-static inline uint64_t os_io_read64(os_io_mem_t base, unsigned offset)
-{
-    return readq(base + offset);
-}
-
-static inline void os_io_write8(os_io_mem_t base, unsigned offset, uint8_t val)
-{
-    writeb(val, base + offset);
-}
-
-static inline void os_io_write16(os_io_mem_t base, unsigned offset, uint16_t val)
-{
-    writew(val, base + offset);
-}
-
-static inline void os_io_write32(os_io_mem_t base, unsigned offset, uint32_t val)
-{
-    writel(val, base + offset);
-}
-
-static inline void os_io_write64(os_io_mem_t base, unsigned offset, uint64_t val)
-{
-    writeq(val, base + offset);
-}
-
-static inline void os_io_memory_barrier(void)
-{
-    mb();
-}
-
-#endif /* #ifndef __OSKA_LINUX_IO_H */