diff options
| author | David S. Miller <davem@davemloft.net> | 2013-08-04 04:36:46 (GMT) |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-08-04 04:36:46 (GMT) |
| commit | 0e76a3a587fc7abda2badf249053b427baad255e (patch) | |
| tree | 646a1da67dc25654552028225ca4b7a0a8043cc9 /drivers/staging/csr/csr_wifi_nme_converter_init.h | |
| parent | fba3679d34511c42bf452e89dda457a1219eb43a (diff) | |
| parent | 72a67a94bcba71a5fddd6b3596a20604d2b5dcd6 (diff) | |
| download | linux-fsl-qoriq-0e76a3a587fc7abda2badf249053b427baad255e.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Merge net into net-next to setup some infrastructure Eric
Dumazet needs for usbnet changes.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/staging/csr/csr_wifi_nme_converter_init.h')
| -rw-r--r-- | drivers/staging/csr/csr_wifi_nme_converter_init.h | 38 |
1 files changed, 0 insertions, 38 deletions
diff --git a/drivers/staging/csr/csr_wifi_nme_converter_init.h b/drivers/staging/csr/csr_wifi_nme_converter_init.h deleted file mode 100644 index 85e6f5f..0000000 --- a/drivers/staging/csr/csr_wifi_nme_converter_init.h +++ /dev/null @@ -1,38 +0,0 @@ -/***************************************************************************** - - (c) Cambridge Silicon Radio Limited 2011 - All rights reserved and confidential information of CSR - - Refer to LICENSE.txt included with this source for details - on the license terms. - -*****************************************************************************/ - -/* Note: this is an auto-generated file. */ - -#ifndef CSR_WIFI_NME_CONVERTER_INIT_H__ -#define CSR_WIFI_NME_CONVERTER_INIT_H__ - -#ifndef CSR_WIFI_NME_ENABLE -#error CSR_WIFI_NME_ENABLE MUST be defined inorder to use csr_wifi_nme_converter_init.h -#endif - -#ifndef EXCLUDE_CSR_WIFI_NME_MODULE - -#include "csr_msgconv.h" - -#ifdef CSR_LOG_ENABLE -#include "csr_log.h" - -extern const CsrLogPrimitiveInformation* CsrWifiNmeTechInfoGet(void); -#endif /* CSR_LOG_ENABLE */ - -extern void CsrWifiNmeConverterInit(void); - -#else /* EXCLUDE_CSR_WIFI_NME_MODULE */ - -#define CsrWifiNmeConverterInit() - -#endif /* EXCLUDE_CSR_WIFI_NME_MODULE */ - -#endif /* CSR_WIFI_NME_CONVERTER_INIT_H__ */ |