diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2018-05-23 11:05:26 +0200 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2018-05-23 11:05:59 +0200 |
| commit | dd8070bff204a67fcb6585f18047841a895b68d7 (patch) | |
| tree | cce17d4b8eb8987194beb40498c8f83e74d6799f /include/linux/platform_data/b53.h | |
| parent | f3a7ca64587f58686d4e2e894e9abbfbc9dffb25 (diff) | |
| parent | 1fe8c06c4a0d3b589f076cd00c25082840f10423 (diff) | |
Merge remote-tracking branch 'net-next/master' into mac80211-next
Bring in net-next which had pulled in net, so I have the changes
from mac80211 and can apply a patch that would otherwise conflict.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'include/linux/platform_data/b53.h')
| -rw-r--r-- | include/linux/platform_data/b53.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/platform_data/b53.h b/include/linux/platform_data/b53.h index 69d279c0da96..8eaef2f2b691 100644 --- a/include/linux/platform_data/b53.h +++ b/include/linux/platform_data/b53.h @@ -20,8 +20,12 @@ #define __B53_H #include <linux/kernel.h> +#include <net/dsa.h> struct b53_platform_data { + /* Must be first such that dsa_register_switch() can access it */ + struct dsa_chip_data cd; + u32 chip_id; u16 enabled_ports; |