diff options
| author | Mark Brown <broonie@kernel.org> | 2014-10-20 12:55:07 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2014-10-20 13:27:32 -0400 |
| commit | b7a40242c82cd73cfcea305f23e67d068dd8401a (patch) | |
| tree | 251b49d19cd7c371847ae1f951e1b537ca0e1c15 /include/linux/netdevice.h | |
| parent | d26833bfce5e56017bea9f1f50838f20e18e7b7e (diff) | |
| parent | 9c6de47d53a3ce8df1642ae67823688eb98a190a (diff) | |
Merge branch 'fix/dw' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi into spi-dw
Conflicts:
drivers/spi/spi-dw-mid.c
Diffstat (limited to 'include/linux/netdevice.h')
| -rw-r--r-- | include/linux/netdevice.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index 38377392d082..c8e388e5fccc 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h | |||
| @@ -3176,7 +3176,7 @@ static inline int __dev_uc_sync(struct net_device *dev, | |||
| 3176 | } | 3176 | } |
| 3177 | 3177 | ||
| 3178 | /** | 3178 | /** |
| 3179 | * __dev_uc_unsync - Remove synchonized addresses from device | 3179 | * __dev_uc_unsync - Remove synchronized addresses from device |
| 3180 | * @dev: device to sync | 3180 | * @dev: device to sync |
| 3181 | * @unsync: function to call if address should be removed | 3181 | * @unsync: function to call if address should be removed |
| 3182 | * | 3182 | * |
| @@ -3220,7 +3220,7 @@ static inline int __dev_mc_sync(struct net_device *dev, | |||
| 3220 | } | 3220 | } |
| 3221 | 3221 | ||
| 3222 | /** | 3222 | /** |
| 3223 | * __dev_mc_unsync - Remove synchonized addresses from device | 3223 | * __dev_mc_unsync - Remove synchronized addresses from device |
| 3224 | * @dev: device to sync | 3224 | * @dev: device to sync |
| 3225 | * @unsync: function to call if address should be removed | 3225 | * @unsync: function to call if address should be removed |
| 3226 | * | 3226 | * |