summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndy Voltz <andy.voltz@timesys.com>2011-06-02 15:30:47 -0400
committerAndy Voltz <andy.voltz@timesys.com>2011-06-02 15:30:47 -0400
commitd3e3a86046a801143d54b2c4bb2173088b0f3d30 (patch)
treed7326a5caeabc0038a5e7356b6bc94fbc19dd9c1
parent7ca0350b8c0fbe95b24dd7f2f1da51055a04eb43 (diff)
remove hw symlink which caused issues for git diff2.6.35.3-mx51-201107021930
-rw-r--r--drivers/staging/ath6kl/bmi/include/bmi_internal.h2
-rw-r--r--drivers/staging/ath6kl/hif/sdio/linux_sdio/src/hif.c2
-rw-r--r--drivers/staging/ath6kl/htc2/AR6000/ar6k.c2
-rw-r--r--drivers/staging/ath6kl/htc2/AR6000/ar6k_events.c2
l---------drivers/staging/ath6kl/include/common/AR6002/hw2.0/hw1
-rw-r--r--drivers/staging/ath6kl/miscdrv/common_drv.c14
-rw-r--r--drivers/staging/ath6kl/os/linux/eeprom.c4
7 files changed, 13 insertions, 14 deletions
diff --git a/drivers/staging/ath6kl/bmi/include/bmi_internal.h b/drivers/staging/ath6kl/bmi/include/bmi_internal.h
index a44027cee4ea..a4c146451957 100644
--- a/drivers/staging/ath6kl/bmi/include/bmi_internal.h
+++ b/drivers/staging/ath6kl/bmi/include/bmi_internal.h
@@ -30,7 +30,7 @@
#include "a_osapi.h"
#define ATH_MODULE_NAME bmi
#include "a_debug.h"
-#include "AR6002/hw2.0/hw/mbox_host_reg.h"
+#include "AR6002/hw.0/mbox_host_reg.h"
#include "bmi_msg.h"
#define ATH_DEBUG_BMI ATH_DEBUG_MAKE_MODULE_MASK(0)
diff --git a/drivers/staging/ath6kl/hif/sdio/linux_sdio/src/hif.c b/drivers/staging/ath6kl/hif/sdio/linux_sdio/src/hif.c
index f0e9aa43f8fb..c4b8fa206e85 100644
--- a/drivers/staging/ath6kl/hif/sdio/linux_sdio/src/hif.c
+++ b/drivers/staging/ath6kl/hif/sdio/linux_sdio/src/hif.c
@@ -37,7 +37,7 @@
#include "hif_internal.h"
#define ATH_MODULE_NAME hif
#include "a_debug.h"
-#include "AR6002/hw2.0/hw/mbox_host_reg.h"
+#include "AR6002/hw.0/mbox_host_reg.h"
#if HIF_USE_DMA_BOUNCE_BUFFER
/* macro to check if DMA buffer is WORD-aligned and DMA-able. Most host controllers assume the
diff --git a/drivers/staging/ath6kl/htc2/AR6000/ar6k.c b/drivers/staging/ath6kl/htc2/AR6000/ar6k.c
index 1efc85ce02b2..e0f76f710949 100644
--- a/drivers/staging/ath6kl/htc2/AR6000/ar6k.c
+++ b/drivers/staging/ath6kl/htc2/AR6000/ar6k.c
@@ -26,7 +26,7 @@
#include "a_config.h"
#include "athdefs.h"
#include "a_types.h"
-#include "AR6002/hw2.0/hw/mbox_host_reg.h"
+#include "AR6002/hw.0/mbox_host_reg.h"
#include "a_osapi.h"
#include "../htc_debug.h"
#include "hif.h"
diff --git a/drivers/staging/ath6kl/htc2/AR6000/ar6k_events.c b/drivers/staging/ath6kl/htc2/AR6000/ar6k_events.c
index 920123b9ba1a..002f4675d628 100644
--- a/drivers/staging/ath6kl/htc2/AR6000/ar6k_events.c
+++ b/drivers/staging/ath6kl/htc2/AR6000/ar6k_events.c
@@ -26,7 +26,7 @@
#include "a_config.h"
#include "athdefs.h"
#include "a_types.h"
-#include "AR6002/hw2.0/hw/mbox_host_reg.h"
+#include "AR6002/hw.0/mbox_host_reg.h"
#include "a_osapi.h"
#include "../htc_debug.h"
#include "hif.h"
diff --git a/drivers/staging/ath6kl/include/common/AR6002/hw2.0/hw b/drivers/staging/ath6kl/include/common/AR6002/hw2.0/hw
deleted file mode 120000
index 8fae5c67cfcd..000000000000
--- a/drivers/staging/ath6kl/include/common/AR6002/hw2.0/hw
+++ /dev/null
@@ -1 +0,0 @@
-../hw.0 \ No newline at end of file
diff --git a/drivers/staging/ath6kl/miscdrv/common_drv.c b/drivers/staging/ath6kl/miscdrv/common_drv.c
index 6754fde467de..438026f667bc 100644
--- a/drivers/staging/ath6kl/miscdrv/common_drv.c
+++ b/drivers/staging/ath6kl/miscdrv/common_drv.c
@@ -25,13 +25,13 @@
#include "athdefs.h"
#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 "AR6002/hw.0/mbox_host_reg.h"
+#include "AR6002/hw.0/apb_map.h"
+#include "AR6002/hw.0/si_reg.h"
+#include "AR6002/hw.0/gpio_reg.h"
+#include "AR6002/hw.0/rtc_reg.h"
+#include "AR6002/hw.0/vmc_reg.h"
+#include "AR6002/hw.0/mbox_reg.h"
#include "a_osapi.h"
#include "targaddrs.h"
diff --git a/drivers/staging/ath6kl/os/linux/eeprom.c b/drivers/staging/ath6kl/os/linux/eeprom.c
index 8dd130aec253..b67ef3f92a49 100644
--- a/drivers/staging/ath6kl/os/linux/eeprom.c
+++ b/drivers/staging/ath6kl/os/linux/eeprom.c
@@ -26,8 +26,8 @@
#include "htc.h"
#include <linux/fs.h>
-#include "AR6002/hw2.0/hw/gpio_reg.h"
-#include "AR6002/hw2.0/hw/si_reg.h"
+#include "AR6002/hw.0/gpio_reg.h"
+#include "AR6002/hw.0/si_reg.h"
//
// defines