Merge tag 'nfc-next-4.7-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo...

[mirror_ubuntu-hirsute-kernel.git] / drivers / net / ethernet / intel / fm10k / fm10k_iov.c

diff --git a/drivers/net/ethernet/intel/fm10k/fm10k_iov.c b/drivers/net/ethernet/intel/fm10k/fm10k_iov.c
index acfb8b1f88a70b3b725a6d81c8a8a8cb8b19577f..47f0743ec03b8f38f9cd3012a0cbc14bb8e3eb2a 100644 (file)
--- a/drivers/net/ethernet/intel/fm10k/fm10k_iov.c
+++ b/drivers/net/ethernet/intel/fm10k/fm10k_iov.c
@@ -1,5 +1,5 @@
-/* Intel Ethernet Switch Host Interface Driver
- * Copyright(c) 2013 - 2015 Intel Corporation.
+/* Intel(R) Ethernet Switch Host Interface Driver
+ * Copyright(c) 2013 - 2016 Intel Corporation.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms and conditions of the GNU General Public License,
@@ -50,7 +50,7 @@ s32 fm10k_iov_event(struct fm10k_intfc *interface)
        s64 vflre;
        int i;
 
-       /* if there is no iov_data then there is no mailboxes to process */
+       /* if there is no iov_data then there is no mailbox to process */
        if (!ACCESS_ONCE(interface->iov_data))
                return 0;
 
@@ -98,7 +98,7 @@ s32 fm10k_iov_mbx(struct fm10k_intfc *interface)
        struct fm10k_iov_data *iov_data;
        int i;
 
-       /* if there is no iov_data then there is no mailboxes to process */
+       /* if there is no iov_data then there is no mailbox to process */
        if (!ACCESS_ONCE(interface->iov_data))
                return 0;