Merge branch 'master' of...

#include <linux/tracepoint.h>

#ifndef CONFIG_ATH5K_TRACER

#if !defined(CONFIG_ATH5K_TRACER) || defined(__CHECKER__)

#undef TRACE_EVENT

#define TRACE_EVENT(name, proto, ...) \

static inline void trace_ ## name(proto) {}

#endif /* __TRACE_ATH5K_H */

#ifdef CONFIG_ATH5K_TRACER

#if defined(CONFIG_ATH5K_TRACER) && !defined(__CHECKER__)

#undef TRACE_INCLUDE_PATH

#define TRACE_INCLUDE_PATH ../../drivers/net/wireless/ath/ath5k

config ATH6KL

	tristate "Atheros mobile chipsets support"

config ATH6KL_SDIO

	tristate "Atheros ath6kl SDIO support"

	depends on ATH6KL

	tristate "Atheros ath6kl support"

	depends on MMC

	depends on CFG80211

	---help---

	  This module adds support for wireless adapters based on

	  Atheros AR6003 and AR6004 chipsets running over SDIO. If you

	  choose to build it as a module, it will be called ath6kl_sdio.

	  Please note that AR6002 and AR6001 are not supported by this

	  driver.

config ATH6KL_USB

	tristate "Atheros ath6kl USB support"

	depends on ATH6KL

	depends on USB

	depends on CFG80211

	depends on EXPERIMENTAL

	---help---

	  This module adds support for wireless adapters based on

	  Atheros AR6004 chipset running over USB. This is still under

	  implementation and it isn't functional. If you choose to

	  build it as a module, it will be called ath6kl_usb.

	  Atheros AR6003 chipset running over SDIO. If you choose to

	  build it as a module, it will be called ath6kl. Pls note

	  that AR6002 and AR6001 are not supported by this driver.

config ATH6KL_DEBUG

	bool "Atheros ath6kl debugging"

# Author(s): ="Atheros"

#------------------------------------------------------------------------------

obj-$(CONFIG_ATH6KL_SDIO) := ath6kl_sdio.o

ath6kl_sdio-y += debug.o

ath6kl_sdio-y += hif.o

ath6kl_sdio-y += htc.o

ath6kl_sdio-y += bmi.o

ath6kl_sdio-y += cfg80211.o

ath6kl_sdio-y += init.o

ath6kl_sdio-y += main.o

ath6kl_sdio-y += txrx.o

ath6kl_sdio-y += wmi.o

ath6kl_sdio-y += sdio.o

ath6kl_sdio-$(CONFIG_NL80211_TESTMODE) += testmode.o

obj-$(CONFIG_ATH6KL_USB) += ath6kl_usb.o

ath6kl_usb-y += debug.o

ath6kl_usb-y += hif.o

ath6kl_usb-y += htc.o

ath6kl_usb-y += bmi.o

ath6kl_usb-y += cfg80211.o

ath6kl_usb-y += init.o

ath6kl_usb-y += main.o

ath6kl_usb-y += txrx.o

ath6kl_usb-y += wmi.o

ath6kl_usb-y += usb.o

ath6kl_usb-$(CONFIG_NL80211_TESTMODE) += testmode.o

obj-$(CONFIG_ATH6KL) := ath6kl.o

ath6kl-y += debug.o

ath6kl-y += hif.o

ath6kl-y += htc.o

ath6kl-y += bmi.o

ath6kl-y += cfg80211.o

ath6kl-y += init.o

ath6kl-y += main.o

ath6kl-y += txrx.o

ath6kl-y += wmi.o

ath6kl-y += sdio.o

ath6kl-$(CONFIG_NL80211_TESTMODE) += testmode.o

ccflags-y += -D__CHECK_ENDIAN__

		return ret;

	}

	if (ar->hif_type == ATH6KL_HIF_TYPE_USB) {

		ret = ath6kl_hif_bmi_read(ar, (u8 *)targ_info,

					  sizeof(*targ_info));

	} else {

	ret = ath6kl_hif_bmi_read(ar, (u8 *)&targ_info->version,

				  sizeof(targ_info->version));

	}

	if (ret) {

		ath6kl_err("Unable to recv target info: %d\n", ret);

		return ret;

	ATH6KL_DBG_BOOT		= BIT(18),    /* driver init and fw boot */

	ATH6KL_DBG_WMI_DUMP	= BIT(19),

	ATH6KL_DBG_SUSPEND	= BIT(20),

	ATH6KL_DBG_USB		= BIT(21),

	ATH6KL_DBG_ANY	        = 0xffffffff  /* enable all logs */

};