From: Samuel Ortiz <sameo@linux.intel.com>
Date: Tue, 2 Apr 2013 09:27:51 +0000 (+0200)
Subject: Revert "NFC: microread: Fix MEI build failure"
X-Git-Tag: v3.10-rc2~34^2~21^2^2~172
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3ad4519c731de86f8a9cec9a22ec90705a38bcab;p=platform%2Fkernel%2Flinux-3.10.git

Revert "NFC: microread: Fix MEI build failure"

This reverts commit 63cd353c34a08af2d1935f8d0c2b6b091714ff79.

We no longer need this fix as the MEI bus APIs are now merged into
char-misc-next.

Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
---

diff --git a/drivers/nfc/microread/mei.c b/drivers/nfc/microread/mei.c
index 13bde92..eef38cf 100644
--- a/drivers/nfc/microread/mei.c
+++ b/drivers/nfc/microread/mei.c
@@ -48,7 +48,7 @@ struct mei_nfc_hdr {
 #define MEI_NFC_MAX_READ (MEI_NFC_HEADER_SIZE + MEI_NFC_MAX_HCI_PAYLOAD)
 
 struct microread_mei_phy {
-	struct mei_device *device;
+	struct mei_device *mei_device;
 	struct nfc_hci_dev *hdev;
 
 	int powered;