diff options
| author | Dave Airlie <airlied@redhat.com> | 2014-01-29 09:38:32 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2014-01-29 09:38:32 +1000 |
| commit | a5bd4f8ab0443ea62be34b112eb78cafb6b3042d (patch) | |
| tree | df3357914d967c2cf4619dbd14f4609daf406a15 /include/net/if_inet6.h | |
| parent | dee13f12f6ab0c0927adf9168dfc84da93fc9f13 (diff) | |
| parent | bed86f15bdc23436fb30d09e2faa3dfb7d3834e1 (diff) | |
Merge branch 'drm-armada-fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-cubox into drm-next
Just one-liner which corrects a select statement for DRM_KMS_FB_HELPER
which looks like it was missed in the initial merge. Based on 3.13.
* 'drm-armada-fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-cubox: (55 commits)
DRM: armada: fix missing DRM_KMS_FB_HELPER select
Diffstat (limited to 'include/net/if_inet6.h')
| -rw-r--r-- | include/net/if_inet6.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/net/if_inet6.h b/include/net/if_inet6.h index 76d54270f2e..65bb1303559 100644 --- a/include/net/if_inet6.h +++ b/include/net/if_inet6.h @@ -165,7 +165,6 @@ struct inet6_dev { struct net_device *dev; struct list_head addr_list; - int valid_ll_addr_cnt; struct ifmcaddr6 *mc_list; struct ifmcaddr6 *mc_tomb; |