Merge remote-tracking branch 'char-misc/char-misc-next'

[karo-tx-linux.git] / drivers / nfc / mei_phy.h

diff --git a/drivers/nfc/mei_phy.h b/drivers/nfc/mei_phy.h
index fbfa3e61738f935b8dd11b641cf28404f9e89103..acd3a1fc69e6dbcfaa187a3f6ceaa49dd436a396 100644 (file)
--- a/drivers/nfc/mei_phy.h
+++ b/drivers/nfc/mei_phy.h
@@ -13,7 +13,7 @@
 /**
  * struct nfc_mei_phy
  *
- * @device: mei device
+ * @cldev: mei client device
  * @hdev:   nfc hci device
 
  * @send_wq: send completion wait queue
@@ -28,7 +28,7 @@
  *    and prevents normal operation.
  */
 struct nfc_mei_phy {
-       struct mei_cl_device *device;
+       struct mei_cl_device *cldev;
        struct nfc_hci_dev *hdev;
 
        wait_queue_head_t send_wq;