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

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
...@@ -7,7 +7,8 @@ ...@@ -7,7 +7,8 @@
* the Free Software Foundation; either version 2 of the License, or (at * the Free Software Foundation; either version 2 of the License, or (at
* your option) any later version. * your option) any later version.
*/ */
#include "deb_defs.h" #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include "libertas_tf.h" #include "libertas_tf.h"
static const struct channel_range channel_ranges[] = { static const struct channel_range channel_ranges[] = {
......
...@@ -9,8 +9,6 @@ ...@@ -9,8 +9,6 @@
#define DRV_NAME "libertas_tf" #define DRV_NAME "libertas_tf"
#endif #endif
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <linux/spinlock.h> #include <linux/spinlock.h>
#ifdef CONFIG_LIBERTAS_THINFIRM_DEBUG #ifdef CONFIG_LIBERTAS_THINFIRM_DEBUG
......
...@@ -9,7 +9,8 @@ ...@@ -9,7 +9,8 @@
*/ */
#define DRV_NAME "lbtf_usb" #define DRV_NAME "lbtf_usb"
#include "deb_defs.h" #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include "libertas_tf.h" #include "libertas_tf.h"
#include "if_usb.h" #include "if_usb.h"
......
...@@ -13,6 +13,8 @@ ...@@ -13,6 +13,8 @@
#include <linux/kthread.h> #include <linux/kthread.h>
#include <net/mac80211.h> #include <net/mac80211.h>
#include "deb_defs.h"
#ifndef DRV_NAME #ifndef DRV_NAME
#define DRV_NAME "libertas_tf" #define DRV_NAME "libertas_tf"
#endif #endif
......
...@@ -7,9 +7,10 @@ ...@@ -7,9 +7,10 @@
* the Free Software Foundation; either version 2 of the License, or (at * the Free Software Foundation; either version 2 of the License, or (at
* your option) any later version. * 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 "libertas_tf.h"
#include "linux/etherdevice.h"
#define DRIVER_RELEASE_VERSION "004.p0" #define DRIVER_RELEASE_VERSION "004.p0"
/* thinfirm version: 5.132.X.pX */ /* thinfirm version: 5.132.X.pX */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment