Merge tag 'mac80211-for-davem-2016-07-06' of git://git.kernel.org/pub/scm/linux/kerne...

[cascardo/linux.git] / arch / mips / include / asm / mach-bcm63xx / bcm63xx_dev_enet.h

diff --git a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_enet.h b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_enet.h
index 466fc85..c4e856f 100644 (file)
--- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_enet.h
+++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_enet.h
@@ -22,7 +22,7 @@ struct bcm63xx_enet_platform_data {
        int has_phy_interrupt;
        int phy_interrupt;
 
-       /* if has_phy, use autonegociated pause parameters or force
+       /* if has_phy, use autonegotiated pause parameters or force
         * them */
        int pause_auto;
        int pause_rx;