ath6kl: Bringing in the upstream version

chromeos/drivers/ath6kl/Makefile

Index: chromeos/drivers/ath6kl/Makefile
diff --git a/chromeos/drivers/ath6kl/Makefile b/chromeos/drivers/ath6kl/Makefile
index 0f6ecfaec582077277b08fc34e20209093b8f91c..ab68078699f29012db533cfbce8ce38780dfe9b7 100644
--- a/chromeos/drivers/ath6kl/Makefile
+++ b/chromeos/drivers/ath6kl/Makefile
@@ -1,19 +1,33 @@
 #------------------------------------------------------------------------------
-# <copyright file="makefile" company="Atheros">
-#    Copyright (c) 2005-2010 Atheros Corporation.  All rights reserved.
+# Copyright (c) 2004-2010 Atheros Communications Inc.
+# All rights reserved.
+#
 # 
-# $ATH_LICENSE_HOSTSDK0_C$
-#------------------------------------------------------------------------------
-#==============================================================================
+#
+# Permission to use, copy, modify, and/or distribute this software for any
+# purpose with or without fee is hereby granted, provided that the above
+# copyright notice and this permission notice appear in all copies.
+#
+# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+#
+#
+#
 # Author(s): ="Atheros"
-#==============================================================================
+#------------------------------------------------------------------------------
 
 ccflags-y += -I$(obj)/include
+ccflags-y += -I$(obj)/include/common
 ccflags-y += -I$(obj)/wlan/include
 ccflags-y += -I$(obj)/os/linux/include
 ccflags-y += -I$(obj)/os
 ccflags-y += -I$(obj)/bmi/include
-ccflags-y += -I$(obj)/include/AR6002/hw4.0
+ccflags-y += -I$(obj)/include/common/AR6002/hw4.0
 
 ifeq ($(CONFIG_AR600x_SD31_XXX),y)
 ccflags-y += -DAR600x_SD31_XXX
@@ -82,6 +96,7 @@ endif
 
 ifeq ($(CONFIG_ATH6KL_ENABLE_HOST_DEBUG),y)
 ccflags-y += -DDEBUG
+ccflags-y += -DATH_DEBUG_MODULE
 endif
 
 ifeq ($(CONFIG_ATH6KL_ENABLE_TARGET_DEBUG_PRINTS),y)
@@ -93,11 +108,11 @@ ccflags-y += -DATH6KL_DISABLE_TARGET_DBGLOGS
 endif
 
 ifeq ($(CONFIG_ATH6KL_VIRTUAL_SCATTER_GATHER),y)
-ccflags-y += -DATH6K_CONFIG_HIF_VIRTUAL_SCATTER
+ccflags-y += -DATH6KL_CONFIG_HIF_VIRTUAL_SCATTER
 endif
 
 ifeq ($(CONFIG_ATH6KL_SKIP_ABI_VERSION_CHECK),y)
-ccflags-y += -DATH6K_SKIP_ABI_VERSION_CHECK
+ccflags-y += -DATH6KL_SKIP_ABI_VERSION_CHECK
 endif
 
 ccflags-y += -DLINUX -DKERNEL_2_6
@@ -123,10 +138,12 @@ ath6kl-y += htc2/htc.o
 ath6kl-y += bmi/src/bmi.o
 ath6kl-y += os/linux/ar6000_drv.o
 ath6kl-y += os/linux/ar6000_raw_if.o
+ath6kl-y += os/linux/ar6000_pm.o
 ath6kl-y += os/linux/netbuf.o
 ath6kl-y += os/linux/wireless_ext.o
 ath6kl-y += os/linux/ioctl.o
 ath6kl-y += os/linux/hci_bridge.o
+ath6kl-y += os/linux/ar6k_pal.o
 ath6kl-y += miscdrv/common_drv.o
 ath6kl-y += miscdrv/credit_dist.o
 ath6kl-y += wmi/wmi.o