diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2015-07-20 19:08:17 +0200 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2015-07-20 19:08:17 +0200 |
| commit | c57d5621d2f2dc238f4b9c4d00b2a54187a75445 (patch) | |
| tree | ece13738a44545fb110e5d73adbf2625bc7a1ea6 /Documentation/nfc/nfc-hci.txt | |
| parent | Input: elan_i2c - enable ELAN0600 acpi panels (diff) | |
| parent | Linux 4.2-rc3 (diff) | |
| download | linux-c57d5621d2f2dc238f4b9c4d00b2a54187a75445.tar.xz linux-c57d5621d2f2dc238f4b9c4d00b2a54187a75445.zip | |
Merge tag 'v4.2-rc3' into next
Sync up with Linux 4.2-rc3 to bring in infrastructure (OF) pieces.
Diffstat (limited to 'Documentation/nfc/nfc-hci.txt')
| -rw-r--r-- | Documentation/nfc/nfc-hci.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/nfc/nfc-hci.txt b/Documentation/nfc/nfc-hci.txt index 0686c9e211c2..0dc078cab972 100644 --- a/Documentation/nfc/nfc-hci.txt +++ b/Documentation/nfc/nfc-hci.txt @@ -122,7 +122,7 @@ This must be done from a context that can sleep. PHY Management -------------- -The physical link (i2c, ...) management is defined by the following struture: +The physical link (i2c, ...) management is defined by the following structure: struct nfc_phy_ops { int (*write)(void *dev_id, struct sk_buff *skb); |