diff options
| author | John W. Linville <linville@tuxdriver.com> | 2010-04-28 16:12:57 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-04-30 14:38:28 -0400 |
| commit | edfcba15bdfa520d8c64b496c9260a9d9e0b6d18 (patch) | |
| tree | 2c1c61463a4617ce5e2f0deeadb620661c5aeca5 /drivers/net/wireless/libertas_tf/main.c | |
| parent | d989ff7cf8d14f1b523f63ba0bf2ec1a9b7c25bc (diff) | |
| download | linux-3.10-edfcba15bdfa520d8c64b496c9260a9d9e0b6d18.tar.gz linux-3.10-edfcba15bdfa520d8c64b496c9260a9d9e0b6d18.tar.bz2 linux-3.10-edfcba15bdfa520d8c64b496c9260a9d9e0b6d18.zip | |
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>
Diffstat (limited to 'drivers/net/wireless/libertas_tf/main.c')
| -rw-r--r-- | drivers/net/wireless/libertas_tf/main.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/wireless/libertas_tf/main.c b/drivers/net/wireless/libertas_tf/main.c index a6b30d778f5..895b557d664 100644 --- a/drivers/net/wireless/libertas_tf/main.c +++ b/drivers/net/wireless/libertas_tf/main.c @@ -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 */ |