From 3ad4519c731de86f8a9cec9a22ec90705a38bcab Mon Sep 17 00:00:00 2001 From: Samuel Ortiz Date: Tue, 2 Apr 2013 11:27:51 +0200 Subject: [PATCH] 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 Signed-off-by: John W. Linville --- drivers/nfc/microread/mei.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/nfc/microread/mei.c b/drivers/nfc/microread/mei.c index 13bde92b1e29..eef38cfd812e 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; -- 2.20.1