diff options
author | David S. Miller <davem@davemloft.net> | 2015-07-14 02:28:09 +0200 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2015-07-14 02:28:09 +0200 |
commit | 638d3c63811e31b2745f7fdd568b38c8abcffe03 (patch) | |
tree | 606426ab4de84e59c5f50e1e3cce6e24819d45af /scripts/mod/devicetable-offsets.c | |
parent | bridge: mdb: add vlan support for user entries (diff) | |
parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
download | linux-638d3c63811e31b2745f7fdd568b38c8abcffe03.tar.xz linux-638d3c63811e31b2745f7fdd568b38c8abcffe03.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
net/bridge/br_mdb.c
Minor conflict in br_mdb.c, in 'net' we added a memset of the
on-stack 'ip' variable whereas in 'net-next' we assign a new
member 'vid'.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'scripts/mod/devicetable-offsets.c')
-rw-r--r-- | scripts/mod/devicetable-offsets.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/scripts/mod/devicetable-offsets.c b/scripts/mod/devicetable-offsets.c index eff7de1fc82e..e70fcd12eeeb 100644 --- a/scripts/mod/devicetable-offsets.c +++ b/scripts/mod/devicetable-offsets.c @@ -63,6 +63,8 @@ int main(void) DEVID(acpi_device_id); DEVID_FIELD(acpi_device_id, id); + DEVID_FIELD(acpi_device_id, cls); + DEVID_FIELD(acpi_device_id, cls_msk); DEVID(pnp_device_id); DEVID_FIELD(pnp_device_id, id); |