From 386432c6f54bdbef55bb8539f7b6b3713cca3151 Mon Sep 17 00:00:00 2001
From: Tomas Winkler <tomas.winkler@intel.com>
Date: Mon, 2 Apr 2012 20:32:39 +0300
Subject: [PATCH] --- yaml --- r: 304252 b: refs/heads/master c:
 c38ea24e22e8c416d4a2b13355a546b5916ae296 h: refs/heads/master v: v3

---
 [refs]                           |  2 +-
 trunk/drivers/staging/mei/main.c | 12 ++----------
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index 03ffedbeb3ba..e588264f1c04 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 68d923d5369e7e8f72dbc75015829b7fc83512fc
+refs/heads/master: c38ea24e22e8c416d4a2b13355a546b5916ae296
diff --git a/trunk/drivers/staging/mei/main.c b/trunk/drivers/staging/mei/main.c
index 5e910108ba3c..20f80dfcf319 100644
--- a/trunk/drivers/staging/mei/main.c
+++ b/trunk/drivers/staging/mei/main.c
@@ -41,15 +41,7 @@
 #include "mei.h"
 #include "interface.h"
 
-
-#define MEI_DRIVER_NAME	"mei"
-#define MEI_DEV_NAME "mei"
-
-/*
- *  mei driver strings
- */
-static char mei_driver_name[] = MEI_DRIVER_NAME;
-static const char mei_driver_string[] = "Intel(R) Management Engine Interface";
+static const char mei_driver_name[] = "mei";
 
 /* The device pointer */
 /* Currently this driver works as long as there is only a single AMT device. */
@@ -932,7 +924,7 @@ static const struct file_operations mei_fops = {
  * Misc Device Struct
  */
 static struct miscdevice  mei_misc_device = {
-		.name = MEI_DRIVER_NAME,
+		.name = "mei",
 		.fops = &mei_fops,
 		.minor = MISC_DYNAMIC_MINOR,
 };