* [PATCH] Revert "NFC: microread: Fix MEI build failure"
@ 2013-04-02 9:27 Samuel Ortiz
0 siblings, 0 replies; only message in thread
From: Samuel Ortiz @ 2013-04-02 9:27 UTC (permalink / raw)
To: John W. Linville; +Cc: Linux Wireless
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>
---
John, this one is for wireless-next and will fix the conflict between net-next
and wireless that Stephen reported today.
---
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 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;
--
1.7.10.4
--
Intel Open Source Technology Centre
http://oss.intel.com/
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2013-04-02 9:27 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-04-02 9:27 [PATCH] Revert "NFC: microread: Fix MEI build failure" Samuel Ortiz
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.