From 66bfd64fc088d16e5d612bb3eb342b56d3313289 Mon Sep 17 00:00:00 2001 From: Tomas Winkler Date: Wed, 29 Feb 2012 12:40:30 +0200 Subject: [PATCH] staging: mei: remove driver internal versioning There is no need for internal module versioning for in-kernel driver: remove mei_version.h Signed-off-by: Tomas Winkler Signed-off-by: Greg Kroah-Hartman --- drivers/staging/mei/iorw.c | 1 - drivers/staging/mei/main.c | 6 +----- drivers/staging/mei/mei_version.h | 31 ------------------------------- 3 files changed, 1 insertion(+), 37 deletions(-) delete mode 100644 drivers/staging/mei/mei_version.h diff --git a/drivers/staging/mei/iorw.c b/drivers/staging/mei/iorw.c index 121b3770ec04..0a80dc4e62f3 100644 --- a/drivers/staging/mei/iorw.c +++ b/drivers/staging/mei/iorw.c @@ -37,7 +37,6 @@ #include "hw.h" #include "mei.h" #include "interface.h" -#include "mei_version.h" diff --git a/drivers/staging/mei/main.c b/drivers/staging/mei/main.c index 55b390823aed..7c9321fa7bb1 100644 --- a/drivers/staging/mei/main.c +++ b/drivers/staging/mei/main.c @@ -38,7 +38,6 @@ #include "mei_dev.h" #include "mei.h" #include "interface.h" -#include "mei_version.h" #define MEI_READ_TIMEOUT 45 @@ -50,7 +49,6 @@ */ static char mei_driver_name[] = MEI_DRIVER_NAME; static const char mei_driver_string[] = "Intel(R) Management Engine Interface"; -static const char mei_driver_version[] = MEI_DRIVER_VERSION; /* The device pointer */ /* Currently this driver works as long as there is only a single AMT device. */ @@ -1206,8 +1204,7 @@ static int __init mei_init_module(void) { int ret; - pr_debug("mei: %s - version %s\n", - mei_driver_string, mei_driver_version); + pr_debug("mei: %s\n", mei_driver_string); /* init pci module */ ret = pci_register_driver(&mei_driver); if (ret < 0) @@ -1238,4 +1235,3 @@ module_exit(mei_exit_module); MODULE_AUTHOR("Intel Corporation"); MODULE_DESCRIPTION("Intel(R) Management Engine Interface"); MODULE_LICENSE("GPL v2"); -MODULE_VERSION(MEI_DRIVER_VERSION); diff --git a/drivers/staging/mei/mei_version.h b/drivers/staging/mei/mei_version.h deleted file mode 100644 index 21955e7921c3..000000000000 --- a/drivers/staging/mei/mei_version.h +++ /dev/null @@ -1,31 +0,0 @@ -/* - * - * Intel Management Engine Interface (Intel MEI) Linux driver - * Copyright (c) 2003-2012, Intel 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. - * - */ - - -#ifndef MEI_VERSION_H -#define MEI_VERSION_H - -#define MAJOR_VERSION 7 -#define MINOR_VERSION 1 -#define QUICK_FIX_NUMBER 20 -#define VER_BUILD 1 - -#define MEI_DRV_VER1 __stringify(MAJOR_VERSION) "." __stringify(MINOR_VERSION) -#define MEI_DRV_VER2 __stringify(QUICK_FIX_NUMBER) "." __stringify(VER_BUILD) - -#define MEI_DRIVER_VERSION MEI_DRV_VER1 "." MEI_DRV_VER2 - -#endif -- 2.30.2