From d193dc23c87c2bf6fd519adbb053ec38007e18dc Mon Sep 17 00:00:00 2001 From: Bill Pemberton Date: Mon, 3 Dec 2012 09:23:12 -0500 Subject: [PATCH] --- yaml --- r: 341775 b: refs/heads/master c: e11787a2313c41a1f4469d797b2d9bc6fe0642b1 h: refs/heads/master i: 341773: b0a271a87d06ac443f0ce1fd549ff12876ddd1be 341771: 4bf4c31e8fd622dce8ec3bd467c6418c7534c391 341767: ebec907e3788d42348ac8e59fa543b8ce354aaa5 341759: bbd7c7545df1a1a53a7c9e1bc8eaebb034559ca5 v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/ibm/ibmveth.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index a96b6265d939..e905fddc5fdc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 170b52b873ca0772a1ae2453258eeec825d9b8af +refs/heads/master: e11787a2313c41a1f4469d797b2d9bc6fe0642b1 diff --git a/trunk/drivers/net/ethernet/ibm/ibmveth.c b/trunk/drivers/net/ethernet/ibm/ibmveth.c index b68d28a130e6..35485f2c144c 100644 --- a/trunk/drivers/net/ethernet/ibm/ibmveth.c +++ b/trunk/drivers/net/ethernet/ibm/ibmveth.c @@ -1324,7 +1324,7 @@ static const struct net_device_ops ibmveth_netdev_ops = { #endif }; -static int __devinit ibmveth_probe(struct vio_dev *dev, +static int ibmveth_probe(struct vio_dev *dev, const struct vio_device_id *id) { int rc, i; @@ -1426,7 +1426,7 @@ static int __devinit ibmveth_probe(struct vio_dev *dev, return 0; } -static int __devexit ibmveth_remove(struct vio_dev *dev) +static int ibmveth_remove(struct vio_dev *dev) { struct net_device *netdev = dev_get_drvdata(&dev->dev); struct ibmveth_adapter *adapter = netdev_priv(netdev); @@ -1593,7 +1593,7 @@ static int ibmveth_resume(struct device *dev) return 0; } -static struct vio_device_id ibmveth_device_table[] __devinitdata = { +static struct vio_device_id ibmveth_device_table[] = { { "network", "IBM,l-lan"}, { "", "" } };