projects
/
platform
/
kernel
/
linux-3.10.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
8b138d4
)
Revert "NFC: microread: Fix MEI build failure"
author
Samuel Ortiz
<sameo@linux.intel.com>
Tue, 2 Apr 2013 09:27:51 +0000
(11:27 +0200)
committer
John W. Linville
<linville@tuxdriver.com>
Wed, 3 Apr 2013 19:07:02 +0000
(15:07 -0400)
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>
drivers/nfc/microread/mei.c
patch
|
blob
|
history
diff --git
a/drivers/nfc/microread/mei.c
b/drivers/nfc/microread/mei.c
index
13bde92
..
eef38cf
100644
(file)
--- 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;