diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-12-16 09:06:50 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-12-16 09:06:50 +0100 |
| commit | b3bb164aa56018ad8476dd2953b654491b7fb468 (patch) | |
| tree | 781240b23aa2613222aac1aa633a9e4f86a934ec /drivers/staging/qlge | |
| parent | f59aba2f75795e5b6a4f1aa31f3e20d7b71ca804 (diff) | |
| parent | d1eef1c619749b2a57e514a3fa67d9a516ffa919 (diff) | |
Merge 5.5-rc2 into staging-next
We want the staging driver fixes in here, and this resolves merge issues
with the isdn code that was pointed out in linux-next
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/qlge')
| -rw-r--r-- | drivers/staging/qlge/qlge_ethtool.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/qlge/qlge_ethtool.c b/drivers/staging/qlge/qlge_ethtool.c index ea7bc6f2dde2..d661218e1aa2 100644 --- a/drivers/staging/qlge/qlge_ethtool.c +++ b/drivers/staging/qlge/qlge_ethtool.c @@ -41,7 +41,7 @@ struct ql_stats { int stat_offset; }; -#define QL_SIZEOF(m) FIELD_SIZEOF(struct ql_adapter, m) +#define QL_SIZEOF(m) sizeof_field(struct ql_adapter, m) #define QL_OFF(m) offsetof(struct ql_adapter, m) static const struct ql_stats ql_gstrings_stats[] = { |