summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuel Ortiz <sameo@linux.intel.com>2013-04-02 11:27:51 +0200
committerJohn W. Linville <linville@tuxdriver.com>2013-04-03 15:07:02 -0400
commit3ad4519c731de86f8a9cec9a22ec90705a38bcab (patch)
tree7fe9d264b74e02894b589aff7c8946b86ec99ecd
parent8b138d4898a006d94de9fd8eab8cb8c49c08ba7e (diff)
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>
-rw-r--r--drivers/nfc/microread/mei.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/nfc/microread/mei.c b/drivers/nfc/microread/mei.c
index 13bde92b1e2..eef38cfd812 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;