mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-25 02:09:42 +00:00
staging: csr: remove csr_util.h
Now that the header file has nothing in it, remove it from the tree, and adjust the places that were including it. Cc: Mikko Virkkilä <mikko.virkkila@bluegiga.com> Cc: Lauri Hintsala <Lauri.Hintsala@bluegiga.com> Cc: Riku Mettälä <riku.mettala@bluegiga.com> Cc: Veli-Pekka Peltola <veli-pekka.peltola@bluegiga.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
df738509ba
commit
d63123fc50
19 changed files with 18 additions and 36 deletions
|
@ -7,9 +7,8 @@
|
|||
on the license terms.
|
||||
|
||||
*****************************************************************************/
|
||||
|
||||
#include <linux/kernel.h>
|
||||
#include "csr_formatted_io.h"
|
||||
#include "csr_util.h"
|
||||
|
||||
s32 CsrSnprintf(char *dest, size_t n, const char *fmt, ...)
|
||||
{
|
||||
|
|
|
@ -14,7 +14,7 @@
|
|||
#include "csr_panic.h"
|
||||
#include "csr_sched.h"
|
||||
#include "csr_msgconv.h"
|
||||
#include "csr_util.h"
|
||||
#include "csr_macro.h"
|
||||
|
||||
static CsrMsgConvEntry *converter;
|
||||
|
||||
|
|
|
@ -11,7 +11,7 @@
|
|||
*****************************************************************************/
|
||||
|
||||
#include <linux/types.h>
|
||||
#include "csr_util.h"
|
||||
#include "csr_macro.h"
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
|
|
|
@ -11,7 +11,7 @@
|
|||
#include <linux/module.h>
|
||||
#include "csr_prim_defs.h"
|
||||
#include "csr_msgconv.h"
|
||||
#include "csr_util.h"
|
||||
#include "csr_macro.h"
|
||||
#include "csr_pmem.h"
|
||||
#include "csr_lib.h"
|
||||
|
||||
|
|
|
@ -10,7 +10,7 @@
|
|||
#include <linux/module.h>
|
||||
#include "csr_pmem.h"
|
||||
#include "csr_unicode.h"
|
||||
#include "csr_util.h"
|
||||
#include "csr_macro.h"
|
||||
|
||||
#define UNI_SUR_HIGH_START ((u32) 0xD800)
|
||||
#define UNI_SUR_HIGH_END ((u32) 0xDBFF)
|
||||
|
|
|
@ -1,16 +0,0 @@
|
|||
#ifndef CSR_UTIL_H__
|
||||
#define CSR_UTIL_H__
|
||||
/*****************************************************************************
|
||||
|
||||
(c) Cambridge Silicon Radio Limited 2010
|
||||
All rights reserved and confidential information of CSR
|
||||
|
||||
Refer to LICENSE.txt included with this source for details
|
||||
on the license terms.
|
||||
|
||||
*****************************************************************************/
|
||||
#include <linux/kernel.h>
|
||||
#include <linux/types.h>
|
||||
#include "csr_macro.h"
|
||||
|
||||
#endif
|
|
@ -16,7 +16,7 @@ extern "C" {
|
|||
#endif
|
||||
|
||||
#include <linux/types.h>
|
||||
#include "csr_util.h"
|
||||
#include "csr_macro.h"
|
||||
#include "csr_pmem.h"
|
||||
#include "csr_panic.h"
|
||||
#include "csr_sched.h"
|
||||
|
|
|
@ -98,7 +98,7 @@ extern "C" {
|
|||
#include "csr_framework_ext.h" /* from the synergy porting folder */
|
||||
#include "csr_sdio.h" /* from the synergy porting folder */
|
||||
#include "csr_pmem.h" /* from the synergy porting folder */
|
||||
#include "csr_util.h" /* from the synergy porting folder */
|
||||
#include "csr_macro.h" /* from the synergy porting folder */
|
||||
#include "csr_formatted_io.h" /* from the synergy gsp folder */
|
||||
#include "csr_wifi_result.h"
|
||||
|
||||
|
|
|
@ -12,7 +12,7 @@
|
|||
|
||||
#include "csr_msgconv.h"
|
||||
#include "csr_pmem.h"
|
||||
#include "csr_util.h"
|
||||
#include "csr_macro.h"
|
||||
|
||||
#ifdef CSR_WIFI_NME_ENABLE
|
||||
#ifdef CSR_WIFI_AP_ENABLE
|
||||
|
|
|
@ -15,7 +15,7 @@
|
|||
|
||||
#include "csr_pmem.h"
|
||||
#include "csr_sched.h"
|
||||
#include "csr_util.h"
|
||||
#include "csr_macro.h"
|
||||
#include "csr_msg_transport.h"
|
||||
|
||||
#include "csr_wifi_lib.h"
|
||||
|
|
|
@ -15,7 +15,7 @@
|
|||
|
||||
#include "csr_pmem.h"
|
||||
#include "csr_sched.h"
|
||||
#include "csr_util.h"
|
||||
#include "csr_macro.h"
|
||||
#include "csr_msg_transport.h"
|
||||
|
||||
#include "csr_wifi_lib.h"
|
||||
|
|
|
@ -12,7 +12,7 @@
|
|||
|
||||
#include "csr_msgconv.h"
|
||||
#include "csr_pmem.h"
|
||||
#include "csr_util.h"
|
||||
#include "csr_macro.h"
|
||||
|
||||
|
||||
#ifdef CSR_LOG_ENABLE
|
||||
|
|
|
@ -12,8 +12,7 @@
|
|||
|
||||
#include "csr_msgconv.h"
|
||||
#include "csr_pmem.h"
|
||||
#include "csr_util.h"
|
||||
|
||||
#include "csr_macro.h"
|
||||
|
||||
#ifdef CSR_LOG_ENABLE
|
||||
#include "csr_log.h"
|
||||
|
|
|
@ -15,7 +15,7 @@
|
|||
|
||||
#include "csr_pmem.h"
|
||||
#include "csr_sched.h"
|
||||
#include "csr_util.h"
|
||||
#include "csr_macro.h"
|
||||
#include "csr_msg_transport.h"
|
||||
|
||||
#include "csr_wifi_lib.h"
|
||||
|
|
|
@ -15,7 +15,7 @@
|
|||
|
||||
#include "csr_pmem.h"
|
||||
#include "csr_sched.h"
|
||||
#include "csr_util.h"
|
||||
#include "csr_macro.h"
|
||||
#include "csr_msg_transport.h"
|
||||
|
||||
#include "csr_wifi_lib.h"
|
||||
|
|
|
@ -10,7 +10,7 @@
|
|||
|
||||
#include <linux/module.h>
|
||||
#include "csr_pmem.h"
|
||||
#include "csr_util.h"
|
||||
#include "csr_macro.h"
|
||||
#include "csr_msgconv.h"
|
||||
#include "csr_wifi_msgconv.h"
|
||||
#include "csr_wifi_lib.h"
|
||||
|
|
|
@ -15,7 +15,7 @@
|
|||
|
||||
#include "csr_pmem.h"
|
||||
#include "csr_sched.h"
|
||||
#include "csr_util.h"
|
||||
#include "csr_macro.h"
|
||||
#include "csr_msg_transport.h"
|
||||
|
||||
#include "csr_wifi_lib.h"
|
||||
|
|
|
@ -12,7 +12,7 @@
|
|||
|
||||
#include "csr_msgconv.h"
|
||||
#include "csr_pmem.h"
|
||||
#include "csr_util.h"
|
||||
#include "csr_macro.h"
|
||||
|
||||
|
||||
#ifdef CSR_LOG_ENABLE
|
||||
|
|
|
@ -15,7 +15,7 @@
|
|||
|
||||
#include "csr_pmem.h"
|
||||
#include "csr_sched.h"
|
||||
#include "csr_util.h"
|
||||
#include "csr_macro.h"
|
||||
#include "csr_msg_transport.h"
|
||||
|
||||
#include "csr_wifi_lib.h"
|
||||
|
|
Loading…
Reference in a new issue