From: Samuel Ortiz <sameo@linux.intel.com>
To: "John W. Linville" <linville@tuxdriver.com>
Cc: Linux Wireless <linux-wireless@vger.kernel.org>
Subject: [PATCH] Revert "NFC: microread: Fix MEI build failure"
Date: Tue, 2 Apr 2013 11:27:51 +0200 [thread overview]
Message-ID: <20130402092751.GE17363@zurbaran> (raw)
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/
reply other threads:[~2013-04-02 9:27 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20130402092751.GE17363@zurbaran \
--to=sameo@linux.intel.com \
--cc=linux-wireless@vger.kernel.org \
--cc=linville@tuxdriver.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox