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
Loading
Loading
Loading
Loading
+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[] = {
+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
+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"

+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
+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 */