From f7c6dfda0533e2977cd5c7fdb2d38d1078ecf849 Mon Sep 17 00:00:00 2001 From: "K. Y. Srinivasan" Date: Thu, 12 May 2011 19:34:18 -0700 Subject: [PATCH] Staging: hv: Move the contents of the file version_info.h to hyperv.h Move the contents of the file version_info.h to hyperv.h. Signed-off-by: K. Y. Srinivasan Signed-off-by: Haiyang Zhang Signed-off-by: Abhishek Kane Signed-off-by: Hank Janssen Signed-off-by: Greg Kroah-Hartman --- drivers/staging/hv/blkvsc_drv.c | 1 - drivers/staging/hv/hv_kvp.c | 1 - drivers/staging/hv/hv_mouse.c | 1 - drivers/staging/hv/hv_util.c | 1 - drivers/staging/hv/hyperv.h | 21 ++++++++++++++ drivers/staging/hv/netvsc_drv.c | 1 - drivers/staging/hv/storvsc_drv.c | 1 - drivers/staging/hv/version_info.h | 48 ------------------------------- drivers/staging/hv/vmbus_drv.c | 1 - 9 files changed, 21 insertions(+), 55 deletions(-) delete mode 100644 drivers/staging/hv/version_info.h diff --git a/drivers/staging/hv/blkvsc_drv.c b/drivers/staging/hv/blkvsc_drv.c index 0e5206ab5d09..039bc633d223 100644 --- a/drivers/staging/hv/blkvsc_drv.c +++ b/drivers/staging/hv/blkvsc_drv.c @@ -35,7 +35,6 @@ #include "hyperv.h" #include "hv_api.h" #include "logging.h" -#include "version_info.h" #include "vmbus.h" #include "storvsc_api.h" diff --git a/drivers/staging/hv/hv_kvp.c b/drivers/staging/hv/hv_kvp.c index 04875c2f0933..8e762fb884c4 100644 --- a/drivers/staging/hv/hv_kvp.c +++ b/drivers/staging/hv/hv_kvp.c @@ -33,7 +33,6 @@ #include "vmbus.h" #include "vmbus_packet_format.h" #include "vmbus_channel_interface.h" -#include "version_info.h" #include "channel.h" #include "vmbus_private.h" #include "vmbus_api.h" diff --git a/drivers/staging/hv/hv_mouse.c b/drivers/staging/hv/hv_mouse.c index 78db75d127be..d8f82d531e17 100644 --- a/drivers/staging/hv/hv_mouse.c +++ b/drivers/staging/hv/hv_mouse.c @@ -29,7 +29,6 @@ #include "hyperv.h" #include "hv_api.h" #include "logging.h" -#include "version_info.h" #include "vmbus.h" #include "vmbus_api.h" #include "channel.h" diff --git a/drivers/staging/hv/hv_util.c b/drivers/staging/hv/hv_util.c index 672a5961d63b..534f052cbdc0 100644 --- a/drivers/staging/hv/hv_util.c +++ b/drivers/staging/hv/hv_util.c @@ -35,7 +35,6 @@ #include "vmbus.h" #include "vmbus_packet_format.h" #include "vmbus_channel_interface.h" -#include "version_info.h" #include "channel.h" #include "vmbus_private.h" #include "vmbus_api.h" diff --git a/drivers/staging/hv/hyperv.h b/drivers/staging/hv/hyperv.h index 0baa868e4d32..2cd1b36b0564 100644 --- a/drivers/staging/hv/hyperv.h +++ b/drivers/staging/hv/hyperv.h @@ -101,4 +101,25 @@ struct hv_ring_buffer_debug_info { u32 bytes_avail_towrite; }; +/* + * We use the same version numbering for all Hyper-V modules. + * + * Definition of versioning is as follows; + * + * Major Number Changes for these scenarios; + * 1. When a new version of Windows Hyper-V + * is released. + * 2. A Major change has occurred in the + * Linux IC's. + * (For example the merge for the first time + * into the kernel) Every time the Major Number + * changes, the Revision number is reset to 0. + * Minor Number Changes when new functionality is added + * to the Linux IC's that is not a bug fix. + * + * 3.1 - Added completed hv_utils driver. Shutdown/Heartbeat/Timesync + */ +#define HV_DRV_VERSION "3.1" + + #endif /* _HYPERV_H */ diff --git a/drivers/staging/hv/netvsc_drv.c b/drivers/staging/hv/netvsc_drv.c index 93c9ee1c6059..3b04cfaa2e5e 100644 --- a/drivers/staging/hv/netvsc_drv.c +++ b/drivers/staging/hv/netvsc_drv.c @@ -42,7 +42,6 @@ #include "hyperv.h" #include "hv_api.h" #include "logging.h" -#include "version_info.h" #include "vmbus.h" #include "netvsc_api.h" diff --git a/drivers/staging/hv/storvsc_drv.c b/drivers/staging/hv/storvsc_drv.c index c0633e9eceac..a9344d9481ba 100644 --- a/drivers/staging/hv/storvsc_drv.c +++ b/drivers/staging/hv/storvsc_drv.c @@ -36,7 +36,6 @@ #include "hyperv.h" #include "hv_api.h" #include "logging.h" -#include "version_info.h" #include "vmbus.h" #include "storvsc_api.h" #include "vstorage.h" diff --git a/drivers/staging/hv/version_info.h b/drivers/staging/hv/version_info.h deleted file mode 100644 index 35178f2c7967..000000000000 --- a/drivers/staging/hv/version_info.h +++ /dev/null @@ -1,48 +0,0 @@ -/* - * - * Copyright (c) 2009, Microsoft Corporation. - * - * This program is free software; you can redistribute it and/or modify it - * under the terms and conditions of the GNU General Public License, - * version 2, as published by the Free Software Foundation. - * - * This program is distributed in the hope it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for - * more details. - * - * You should have received a copy of the GNU General Public License along with - * this program; if not, write to the Free Software Foundation, Inc., 59 Temple - * Place - Suite 330, Boston, MA 02111-1307 USA. - * - * Authors: - * Haiyang Zhang - * Hank Janssen - * - */ - -#ifndef __HV_VERSION_INFO -#define __HV_VERSION_INFO - -/* - * We use the same version numbering for all Hyper-V modules. - * - * Definition of versioning is as follows; - * - * Major Number Changes for these scenarios; - * 1. When a new version of Windows Hyper-V - * is released. - * 2. A Major change has occurred in the - * Linux IC's. - * (For example the merge for the first time - * into the kernel) Every time the Major Number - * changes, the Revision number is reset to 0. - * Minor Number Changes when new functionality is added - * to the Linux IC's that is not a bug fix. - * - * 3.1 - Added completed hv_utils driver. Shutdown/Heartbeat/Timesync - */ -#define HV_DRV_VERSION "3.1" - - -#endif diff --git a/drivers/staging/hv/vmbus_drv.c b/drivers/staging/hv/vmbus_drv.c index 2b2ada7f3386..7debaa74ff60 100644 --- a/drivers/staging/hv/vmbus_drv.c +++ b/drivers/staging/hv/vmbus_drv.c @@ -36,7 +36,6 @@ #include #include "hyperv.h" -#include "version_info.h" #include "hv_api.h" #include "logging.h" #include "vmbus.h" -- 2.30.2