OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

libertas_tf: avoid warning about pr_fmt redefinition 

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

Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
John W. Linville 2010-04-28 16:12:57 -04:00
parent d989ff7cf8
commit edfcba15bd
5 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/net/wireless/libertas_tf/cmd.c
View File

@ -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[] = {

2
drivers/net/wireless/libertas_tf/deb_defs.h
View File

@ -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

3
drivers/net/wireless/libertas_tf/if_usb.c
View File

@ -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
drivers/net/wireless/libertas_tf/libertas_tf.h
View File

@ -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

5
drivers/net/wireless/libertas_tf/main.c
View File

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