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 branches 'release', 'asus', 'sony-laptop' and 'thinkpad' into release
[pandora-kernel.git]
/
drivers
/
net
/
iseries_veth.c
diff --git
a/drivers/net/iseries_veth.c
b/drivers/net/iseries_veth.c
index
90ff4ec
..
58d3bb6
100644
(file)
--- a/
drivers/net/iseries_veth.c
+++ b/
drivers/net/iseries_veth.c
@@
-844,7
+844,7
@@
static int veth_init_connection(u8 rlp)
/* This gets us 1 reference, which is held on behalf of the driver
* infrastructure. It's released at module unload. */
/* This gets us 1 reference, which is held on behalf of the driver
* infrastructure. It's released at module unload. */
- kobject_init
_ng
(&cnx->kobject, &veth_lpar_connection_ktype);
+ kobject_init(&cnx->kobject, &veth_lpar_connection_ktype);
msgs = kcalloc(VETH_NUMBUFFERS, sizeof(struct veth_msg), GFP_KERNEL);
if (! msgs) {
msgs = kcalloc(VETH_NUMBUFFERS, sizeof(struct veth_msg), GFP_KERNEL);
if (! msgs) {
@@
-1020,7
+1020,7
@@
static const struct ethtool_ops ops = {
.get_link = veth_get_link,
};
.get_link = veth_get_link,
};
-static struct net_device *
__init
veth_probe_one(int vlan,
+static struct net_device *veth_probe_one(int vlan,
struct vio_dev *vio_dev)
{
struct net_device *dev;
struct vio_dev *vio_dev)
{
struct net_device *dev;
@@
-1083,8
+1083,8
@@
static struct net_device * __init veth_probe_one(int vlan,
return NULL;
}
return NULL;
}
- kobject_init
_ng
(&port->kobject, &veth_port_ktype);
- if (0 != kobject_add
_ng
(&port->kobject, &dev->dev.kobj, "veth_port"))
+ kobject_init(&port->kobject, &veth_port_ktype);
+ if (0 != kobject_add(&port->kobject, &dev->dev.kobj, "veth_port"))
veth_error("Failed adding port for %s to sysfs.\n", dev->name);
veth_info("%s attached to iSeries vlan %d (LPAR map = 0x%.4X)\n",
veth_error("Failed adding port for %s to sysfs.\n", dev->name);
veth_info("%s attached to iSeries vlan %d (LPAR map = 0x%.4X)\n",
@@
-1705,7
+1705,7
@@
static int __init veth_module_init(void)
kobj = &veth_cnx[i]->kobject;
/* If the add failes, complain but otherwise continue */
kobj = &veth_cnx[i]->kobject;
/* If the add failes, complain but otherwise continue */
- if (0 !=
kobject_add_ng(kobj, &veth_driver.driver.
kobj,
+ if (0 !=
driver_add_kobj(&veth_driver.driver,
kobj,
"cnx%.2d", veth_cnx[i]->remote_lp))
veth_error("cnx %d: Failed adding to sysfs.\n", i);
}
"cnx%.2d", veth_cnx[i]->remote_lp))
veth_error("cnx %d: Failed adding to sysfs.\n", i);
}