diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-12-04 16:22:32 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-12-04 16:22:32 +0100 |
| commit | 79598324838a25cc378ecbb8c29dd1e3d3951d35 (patch) | |
| tree | 7d29e81580cba854042df4e33bdc8f38bbd65d03 /drivers/net/virtio_net.c | |
| parent | 8ee763b9c82c6ca0a59a7271ce4fa29d7baf5c09 (diff) | |
| parent | b00615d163cd24fa98d155acfc1f9d81d6fe1103 (diff) | |
| download | kernel-crypto-79598324838a25cc378ecbb8c29dd1e3d3951d35.tar.gz kernel-crypto-79598324838a25cc378ecbb8c29dd1e3d3951d35.tar.xz kernel-crypto-79598324838a25cc378ecbb8c29dd1e3d3951d35.zip | |
Merge branch 'topic/core-change' into for-linus
Diffstat (limited to 'drivers/net/virtio_net.c')
| -rw-r--r-- | drivers/net/virtio_net.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c index 05630f2f693..b9e002fccbc 100644 --- a/drivers/net/virtio_net.c +++ b/drivers/net/virtio_net.c @@ -998,7 +998,7 @@ static unsigned int features[] = { VIRTIO_NET_F_CTRL_RX, VIRTIO_NET_F_CTRL_VLAN, }; -static struct virtio_driver virtio_net = { +static struct virtio_driver virtio_net_driver = { .feature_table = features, .feature_table_size = ARRAY_SIZE(features), .driver.name = KBUILD_MODNAME, @@ -1011,12 +1011,12 @@ static struct virtio_driver virtio_net = { static int __init init(void) { - return register_virtio_driver(&virtio_net); + return register_virtio_driver(&virtio_net_driver); } static void __exit fini(void) { - unregister_virtio_driver(&virtio_net); + unregister_virtio_driver(&virtio_net_driver); } module_init(init); module_exit(fini); |