Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit edfcba15 authored by John W. Linville's avatar John W. Linville
Browse files

libertas_tf: avoid warning about pr_fmt redefinition 



Also includes a minor cleanup regarding quotation of a standard kernel
header file...

Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent d989ff7c

drivers/net/wireless/libertas_tf/cmd.c

+2 −1
Original line number Diff line number Diff line
@@ -7,7 +7,8 @@ 
 *  the Free Software Foundation; either version 2 of the License, or (at

 *  your option) any later version.

 */

#include "deb_defs.h"

#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt



#include "libertas_tf.h"



static const struct channel_range channel_ranges[] = {

drivers/net/wireless/libertas_tf/deb_defs.h

+0 −2
Original line number Diff line number Diff line
@@ -9,8 +9,6 @@ 
#define DRV_NAME "libertas_tf"

#endif



#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt



#include <linux/spinlock.h>



#ifdef CONFIG_LIBERTAS_THINFIRM_DEBUG

drivers/net/wireless/libertas_tf/if_usb.c

+2 −1
Original line number Diff line number Diff line
@@ -9,7 +9,8 @@ 
 */

#define DRV_NAME "lbtf_usb"



#include "deb_defs.h"

#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt



#include "libertas_tf.h"

#include "if_usb.h"

drivers/net/wireless/libertas_tf/libertas_tf.h

+2 −0
Original line number Diff line number Diff line
@@ -13,6 +13,8 @@ 
#include <linux/kthread.h>

#include <net/mac80211.h>



#include "deb_defs.h"



#ifndef DRV_NAME

#define DRV_NAME "libertas_tf"

#endif

drivers/net/wireless/libertas_tf/main.c

+3 −2
Original line number Diff line number Diff line
@@ -7,9 +7,10 @@ 
 *  the Free Software Foundation; either version 2 of the License, or (at

 *  your option) any later version.

 */

#include "deb_defs.h"

#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt



#include <linux/etherdevice.h>

#include "libertas_tf.h"

#include "linux/etherdevice.h"



#define DRIVER_RELEASE_VERSION "004.p0"

/* thinfirm version: 5.132.X.pX */