diff options
author | Tomas Winkler <tomas.winkler@intel.com> | 2012-02-29 05:40:30 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-03-14 15:17:45 -0400 |
commit | 66bfd64fc088d16e5d612bb3eb342b56d3313289 (patch) | |
tree | 27c896a250380594fb98bb8c64631542be4dce11 /drivers/staging | |
parent | 7c26d76be7c33990c02991bff46289c4ded20f4f (diff) |
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 <tomas.winkler@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging')
-rw-r--r-- | drivers/staging/mei/iorw.c | 1 | ||||
-rw-r--r-- | drivers/staging/mei/main.c | 6 | ||||
-rw-r--r-- | drivers/staging/mei/mei_version.h | 31 |
3 files changed, 1 insertions, 37 deletions
diff --git a/drivers/staging/mei/iorw.c b/drivers/staging/mei/iorw.c index 121b3770ec0..0a80dc4e62f 100644 --- a/drivers/staging/mei/iorw.c +++ b/drivers/staging/mei/iorw.c | |||
@@ -37,7 +37,6 @@ | |||
37 | #include "hw.h" | 37 | #include "hw.h" |
38 | #include "mei.h" | 38 | #include "mei.h" |
39 | #include "interface.h" | 39 | #include "interface.h" |
40 | #include "mei_version.h" | ||
41 | 40 | ||
42 | 41 | ||
43 | 42 | ||
diff --git a/drivers/staging/mei/main.c b/drivers/staging/mei/main.c index 55b390823ae..7c9321fa7bb 100644 --- a/drivers/staging/mei/main.c +++ b/drivers/staging/mei/main.c | |||
@@ -38,7 +38,6 @@ | |||
38 | #include "mei_dev.h" | 38 | #include "mei_dev.h" |
39 | #include "mei.h" | 39 | #include "mei.h" |
40 | #include "interface.h" | 40 | #include "interface.h" |
41 | #include "mei_version.h" | ||
42 | 41 | ||
43 | 42 | ||
44 | #define MEI_READ_TIMEOUT 45 | 43 | #define MEI_READ_TIMEOUT 45 |
@@ -50,7 +49,6 @@ | |||
50 | */ | 49 | */ |
51 | static char mei_driver_name[] = MEI_DRIVER_NAME; | 50 | static char mei_driver_name[] = MEI_DRIVER_NAME; |
52 | static const char mei_driver_string[] = "Intel(R) Management Engine Interface"; | 51 | static const char mei_driver_string[] = "Intel(R) Management Engine Interface"; |
53 | static const char mei_driver_version[] = MEI_DRIVER_VERSION; | ||
54 | 52 | ||
55 | /* The device pointer */ | 53 | /* The device pointer */ |
56 | /* Currently this driver works as long as there is only a single AMT device. */ | 54 | /* 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) | |||
1206 | { | 1204 | { |
1207 | int ret; | 1205 | int ret; |
1208 | 1206 | ||
1209 | pr_debug("mei: %s - version %s\n", | 1207 | pr_debug("mei: %s\n", mei_driver_string); |
1210 | mei_driver_string, mei_driver_version); | ||
1211 | /* init pci module */ | 1208 | /* init pci module */ |
1212 | ret = pci_register_driver(&mei_driver); | 1209 | ret = pci_register_driver(&mei_driver); |
1213 | if (ret < 0) | 1210 | if (ret < 0) |
@@ -1238,4 +1235,3 @@ module_exit(mei_exit_module); | |||
1238 | MODULE_AUTHOR("Intel Corporation"); | 1235 | MODULE_AUTHOR("Intel Corporation"); |
1239 | MODULE_DESCRIPTION("Intel(R) Management Engine Interface"); | 1236 | MODULE_DESCRIPTION("Intel(R) Management Engine Interface"); |
1240 | MODULE_LICENSE("GPL v2"); | 1237 | MODULE_LICENSE("GPL v2"); |
1241 | 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 21955e7921c..00000000000 --- a/drivers/staging/mei/mei_version.h +++ /dev/null | |||
@@ -1,31 +0,0 @@ | |||
1 | /* | ||
2 | * | ||
3 | * Intel Management Engine Interface (Intel MEI) Linux driver | ||
4 | * Copyright (c) 2003-2012, Intel Corporation. | ||
5 | * | ||
6 | * This program is free software; you can redistribute it and/or modify it | ||
7 | * under the terms and conditions of the GNU General Public License, | ||
8 | * version 2, as published by the Free Software Foundation. | ||
9 | * | ||
10 | * This program is distributed in the hope it will be useful, but WITHOUT | ||
11 | * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | ||
12 | * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for | ||
13 | * more details. | ||
14 | * | ||
15 | */ | ||
16 | |||
17 | |||
18 | #ifndef MEI_VERSION_H | ||
19 | #define MEI_VERSION_H | ||
20 | |||
21 | #define MAJOR_VERSION 7 | ||
22 | #define MINOR_VERSION 1 | ||
23 | #define QUICK_FIX_NUMBER 20 | ||
24 | #define VER_BUILD 1 | ||
25 | |||
26 | #define MEI_DRV_VER1 __stringify(MAJOR_VERSION) "." __stringify(MINOR_VERSION) | ||
27 | #define MEI_DRV_VER2 __stringify(QUICK_FIX_NUMBER) "." __stringify(VER_BUILD) | ||
28 | |||
29 | #define MEI_DRIVER_VERSION MEI_DRV_VER1 "." MEI_DRV_VER2 | ||
30 | |||
31 | #endif | ||