From fa891ee65651039c241f6c60ab4fa76aaa444be1 Mon Sep 17 00:00:00 2001
From: Vasanthakumar Thiagarajan <vasanth@atheros.com>
Date: Mon, 2 May 2011 11:22:38 +0530
Subject: [PATCH] --- yaml --- r: 249271 b: refs/heads/master c:
 b783adb7d54764db6d7e5f3a9b5aafb836c22805 h: refs/heads/master i:   249269:
 1baad6ef27ff43e415ca57389b420228d761b2e9   249267:
 5b8a7c8622452bdaf09c89d82354ef5dbcdaf6be   249263:
 d10081a306ba46c10080c94bcfad20db154f8af5 v: v3

---
 [refs]                                              |  2 +-
 .../ath6kl/include/common/AR6002/hw2.0/hw/apb_map.h | 13 -------------
 trunk/drivers/staging/ath6kl/miscdrv/common_drv.c   |  2 +-
 3 files changed, 2 insertions(+), 15 deletions(-)
 delete mode 100644 trunk/drivers/staging/ath6kl/include/common/AR6002/hw2.0/hw/apb_map.h

diff --git a/[refs] b/[refs]
index fed05a659761..a7cd209e66dd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a9d4d476dfef07a7e17341a3b792b260fea74dcb
+refs/heads/master: b783adb7d54764db6d7e5f3a9b5aafb836c22805
diff --git a/trunk/drivers/staging/ath6kl/include/common/AR6002/hw2.0/hw/apb_map.h b/trunk/drivers/staging/ath6kl/include/common/AR6002/hw2.0/hw/apb_map.h
deleted file mode 100644
index f3bf6d6cc82b..000000000000
--- a/trunk/drivers/staging/ath6kl/include/common/AR6002/hw2.0/hw/apb_map.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#ifndef _APB_MAP_H_
-#define _APB_MAP_H_
-
-#define RTC_BASE_ADDRESS                         0x00004000
-#define VMC_BASE_ADDRESS                         0x00008000
-#define UART_BASE_ADDRESS                        0x0000c000
-#define SI_BASE_ADDRESS                          0x00010000
-#define GPIO_BASE_ADDRESS                        0x00014000
-#define MBOX_BASE_ADDRESS                        0x00018000
-#define ANALOG_INTF_BASE_ADDRESS                 0x0001c000
-#define MAC_BASE_ADDRESS                         0x00020000
-
-#endif /* _APB_MAP_REG_H_ */
diff --git a/trunk/drivers/staging/ath6kl/miscdrv/common_drv.c b/trunk/drivers/staging/ath6kl/miscdrv/common_drv.c
index 2be2ea494f53..1434d1b9cfc9 100644
--- a/trunk/drivers/staging/ath6kl/miscdrv/common_drv.c
+++ b/trunk/drivers/staging/ath6kl/miscdrv/common_drv.c
@@ -26,12 +26,12 @@
 #include "a_types.h"
 
 #include "AR6002/hw2.0/hw/mbox_host_reg.h"
-#include "AR6002/hw2.0/hw/apb_map.h"
 #include "AR6002/hw2.0/hw/si_reg.h"
 #include "AR6002/hw2.0/hw/gpio_reg.h"
 #include "AR6002/hw2.0/hw/rtc_reg.h"
 #include "AR6002/hw2.0/hw/vmc_reg.h"
 #include "AR6002/hw2.0/hw/mbox_reg.h"
+#include "hw/apb_map.h"
 
 #include "a_osapi.h"
 #include "targaddrs.h"