git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'wireless-next-2.6' of git://git.kernel.org/pub/scm/linux/kernel/git...
[pandora-kernel.git]
/
drivers
/
net
/
eql.c
diff --git
a/drivers/net/eql.c
b/drivers/net/eql.c
index
0cb1cf9
..
a59cf96
100644
(file)
--- a/
drivers/net/eql.c
+++ b/
drivers/net/eql.c
@@
-111,6
+111,8
@@
* Sorry, I had to rewrite most of this for 2.5.x -DaveM
*/
* Sorry, I had to rewrite most of this for 2.5.x -DaveM
*/
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
#include <linux/capability.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/capability.h>
#include <linux/module.h>
#include <linux/kernel.h>
@@
-162,7
+164,7
@@
static void eql_timer(unsigned long param)
}
static const char version[] __initconst =
}
static const char version[] __initconst =
- "Equalizer2002: Simon Janes (simon@ncm.com) and David S. Miller (davem@redhat.com)
\n
";
+ "Equalizer2002: Simon Janes (simon@ncm.com) and David S. Miller (davem@redhat.com)";
static const struct net_device_ops eql_netdev_ops = {
.ndo_open = eql_open,
static const struct net_device_ops eql_netdev_ops = {
.ndo_open = eql_open,
@@
-204,8
+206,8
@@
static int eql_open(struct net_device *dev)
equalizer_t *eql = netdev_priv(dev);
/* XXX We should force this off automatically for the user. */
equalizer_t *eql = netdev_priv(dev);
/* XXX We should force this off automatically for the user. */
- printk(KERN_INFO "%s: remember to turn off Van-Jacobson compression on "
-
"your slave devices.\n", dev->name
);
+ netdev_info(dev,
+
"remember to turn off Van-Jacobson compression on your slave devices\n"
);
BUG_ON(!list_empty(&eql->queue.all_slaves));
BUG_ON(!list_empty(&eql->queue.all_slaves));
@@
-591,7
+593,7
@@
static int __init eql_init_module(void)
{
int err;
{
int err;
- pr
intk(
version);
+ pr
_info("%s\n",
version);
dev_eql = alloc_netdev(sizeof(equalizer_t), "eql", eql_setup);
if (!dev_eql)
dev_eql = alloc_netdev(sizeof(equalizer_t), "eql", eql_setup);
if (!dev_eql)