aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2005-10-24 00:53:21 -0400
committerStephen Rothwell <sfr@canb.auug.org.au>2005-10-24 01:42:12 -0400
commit6fdf5392caa4c3cba65add0a4beec9f5eb96b723 (patch)
tree336ba343889a1d720e09477c2ea88cd5f99a67b9 /drivers/net
parentf38d87f566195d78bd70538d5c774758f2d926d3 (diff)
powerpc: don't duplicate name between vio_driver and device_driver
Just set the name field directly in the device_driver structure contained in the vio_driver struct. Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/ibmveth.c10
-rw-r--r--drivers/net/iseries_veth.c6
2 files changed, 10 insertions, 6 deletions
diff --git a/drivers/net/ibmveth.c b/drivers/net/ibmveth.c
index a2c4dd4fb221..fcf6f2c76300 100644
--- a/drivers/net/ibmveth.c
+++ b/drivers/net/ibmveth.c
@@ -1150,10 +1150,12 @@ static struct vio_device_id ibmveth_device_table[] __devinitdata= {
1150MODULE_DEVICE_TABLE(vio, ibmveth_device_table); 1150MODULE_DEVICE_TABLE(vio, ibmveth_device_table);
1151 1151
1152static struct vio_driver ibmveth_driver = { 1152static struct vio_driver ibmveth_driver = {
1153 .name = (char *)ibmveth_driver_name, 1153 .id_table = ibmveth_device_table,
1154 .id_table = ibmveth_device_table, 1154 .probe = ibmveth_probe,
1155 .probe = ibmveth_probe, 1155 .remove = ibmveth_remove,
1156 .remove = ibmveth_remove 1156 .driver = {
1157 .name = ibmveth_driver_name,
1158 }
1157}; 1159};
1158 1160
1159static int __init ibmveth_module_init(void) 1161static int __init ibmveth_module_init(void)
diff --git a/drivers/net/iseries_veth.c b/drivers/net/iseries_veth.c
index db3bc2f6f0fa..33613fe9556c 100644
--- a/drivers/net/iseries_veth.c
+++ b/drivers/net/iseries_veth.c
@@ -1648,10 +1648,12 @@ static struct vio_device_id veth_device_table[] __devinitdata = {
1648MODULE_DEVICE_TABLE(vio, veth_device_table); 1648MODULE_DEVICE_TABLE(vio, veth_device_table);
1649 1649
1650static struct vio_driver veth_driver = { 1650static struct vio_driver veth_driver = {
1651 .name = DRV_NAME,
1652 .id_table = veth_device_table, 1651 .id_table = veth_device_table,
1653 .probe = veth_probe, 1652 .probe = veth_probe,
1654 .remove = veth_remove 1653 .remove = veth_remove,
1654 .driver = {
1655 .name = DRV_NAME,
1656 }
1655}; 1657};
1656 1658
1657/* 1659/*