From f9b03012f2e206fbba70dc36ebf51d76987f73f3 Mon Sep 17 00:00:00 2001 From: "K. Y. Srinivasan" Date: Thu, 12 May 2011 19:35:13 -0700 Subject: [PATCH] --- yaml --- r: 249701 b: refs/heads/master c: 4753ff6a10136e93c751b53406c8542f446cfe84 h: refs/heads/master i: 249699: c9e5fc284be67b3d9435ff05a60de72aec19d258 v: v3 --- [refs] | 2 +- trunk/drivers/staging/hv/netvsc_drv.c | 29 ++++++++++++++------------- 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/[refs] b/[refs] index b6f94aa28d85..039786c4f3b4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 770cbb589b81a7eaf013e128658280bc9123a888 +refs/heads/master: 4753ff6a10136e93c751b53406c8542f446cfe84 diff --git a/trunk/drivers/staging/hv/netvsc_drv.c b/trunk/drivers/staging/hv/netvsc_drv.c index d3b614899651..b0801c6c96f2 100644 --- a/trunk/drivers/staging/hv/netvsc_drv.c +++ b/trunk/drivers/staging/hv/netvsc_drv.c @@ -438,6 +438,21 @@ static void netvsc_drv_exit(void) vmbus_child_driver_unregister(&netvsc_drv.driver); } + +static const struct dmi_system_id __initconst +hv_netvsc_dmi_table[] __maybe_unused = { + { + .ident = "Hyper-V", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Microsoft Corporation"), + DMI_MATCH(DMI_PRODUCT_NAME, "Virtual Machine"), + DMI_MATCH(DMI_BOARD_NAME, "Virtual Machine"), + }, + }, + { }, +}; +MODULE_DEVICE_TABLE(dmi, hv_netvsc_dmi_table); + static int netvsc_drv_init(int (*drv_init)(struct hv_driver *drv)) { struct hv_driver *drv = &netvsc_drv; @@ -454,20 +469,6 @@ static int netvsc_drv_init(int (*drv_init)(struct hv_driver *drv)) return ret; } -static const struct dmi_system_id __initconst -hv_netvsc_dmi_table[] __maybe_unused = { - { - .ident = "Hyper-V", - .matches = { - DMI_MATCH(DMI_SYS_VENDOR, "Microsoft Corporation"), - DMI_MATCH(DMI_PRODUCT_NAME, "Virtual Machine"), - DMI_MATCH(DMI_BOARD_NAME, "Virtual Machine"), - }, - }, - { }, -}; -MODULE_DEVICE_TABLE(dmi, hv_netvsc_dmi_table); - static int __init netvsc_init(void) { pr_info("initializing....");