From: Vasanthakumar Thiagarajan <vasanth@atheros.com>
Date: Mon, 2 May 2011 05:52:38 +0000 (+0530)
Subject: ath6kl: Remove duplicate abp_map.h
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=b783adb7d54764db6d7e5f3a9b5aafb836c22805;p=deliverable%2Flinux.git

ath6kl: Remove duplicate abp_map.h

Signed-off-by: Vasanthakumar Thiagarajan <vasanth@atheros.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---

diff --git a/drivers/staging/ath6kl/include/common/AR6002/hw2.0/hw/apb_map.h b/drivers/staging/ath6kl/include/common/AR6002/hw2.0/hw/apb_map.h
deleted file mode 100644
index f3bf6d6cc82b..000000000000
--- a/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/drivers/staging/ath6kl/miscdrv/common_drv.c b/drivers/staging/ath6kl/miscdrv/common_drv.c
index 2be2ea494f53..1434d1b9cfc9 100644
--- a/drivers/staging/ath6kl/miscdrv/common_drv.c
+++ b/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"