diff options
| author | Radim Krčmář <rkrcmar@redhat.com> | 2016-06-02 18:28:04 +0300 |
|---|---|---|
| committer | Radim Krčmář <rkrcmar@redhat.com> | 2016-06-02 18:28:04 +0300 |
| commit | 13e98fd1efc7f65cab1bba6cfab7859840f9aa66 (patch) | |
| tree | 88be4e84a1c257e7e999d7bd344c511c66e7973e /include/linux/platform_data | |
| parent | e28e909c36bb5d6319953822d84df00fce7cbd18 (diff) | |
| parent | 05fb05a6ca25e02ad8c31bc440b3c4996864f379 (diff) | |
| download | linux-13e98fd1efc7f65cab1bba6cfab7859840f9aa66.tar.xz | |
Merge tag 'kvm-arm-for-v4.7-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm
KVM/ARM Fixes for v4.7-rc2
Fixes for the vgic, 2 of the patches address a bug introduced in v4.6
while the rest are for the new vgic.
Diffstat (limited to 'include/linux/platform_data')
| -rw-r--r-- | include/linux/platform_data/at24.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/platform_data/at24.h b/include/linux/platform_data/at24.h index dc9a13e5acda..be830b141d83 100644 --- a/include/linux/platform_data/at24.h +++ b/include/linux/platform_data/at24.h @@ -26,7 +26,7 @@ * * An example in pseudo code for a setup() callback: * - * void get_mac_addr(struct mvmem_device *nvmem, void *context) + * void get_mac_addr(struct nvmem_device *nvmem, void *context) * { * u8 *mac_addr = ethernet_pdata->mac_addr; * off_t offset = context; |