Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 289246
b: refs/heads/master
c: 66bfd64
h: refs/heads/master
v: v3
  • Loading branch information
Tomas Winkler authored and Greg Kroah-Hartman committed Mar 14, 2012
1 parent 32d2a1a commit a446f42
Show file tree
Hide file tree
Showing 4 changed files with 2 additions and 38 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 7c26d76be7c33990c02991bff46289c4ded20f4f
refs/heads/master: 66bfd64fc088d16e5d612bb3eb342b56d3313289
1 change: 0 additions & 1 deletion trunk/drivers/staging/mei/iorw.c
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@
#include "hw.h"
#include "mei.h"
#include "interface.h"
#include "mei_version.h"



Expand Down
6 changes: 1 addition & 5 deletions trunk/drivers/staging/mei/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@
#include "mei_dev.h"
#include "mei.h"
#include "interface.h"
#include "mei_version.h"


#define MEI_READ_TIMEOUT 45
Expand All @@ -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. */
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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);
31 changes: 0 additions & 31 deletions trunk/drivers/staging/mei/mei_version.h

This file was deleted.

0 comments on commit a446f42

Please sign in to comment.