diff options
| author | Dave Airlie <airlied@redhat.com> | 2010-03-31 14:55:14 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2010-03-31 14:55:14 +1000 |
| commit | 3595be778d8cb887f0e0575ef0a0c1a094d120bb (patch) | |
| tree | 15671ed8bd3597d2efe13aa57b755c66014acb57 /include/net/dst.h | |
| parent | c414a117c6094c3f86b533f97beaf45ef9075f03 (diff) | |
| parent | 220bf991b0366cc50a94feede3d7341fa5710ee4 (diff) | |
| download | op-kernel-dev-3595be778d8cb887f0e0575ef0a0c1a094d120bb.zip op-kernel-dev-3595be778d8cb887f0e0575ef0a0c1a094d120bb.tar.gz | |
Merge branch 'v2.6.34-rc2' into drm-linus
Diffstat (limited to 'include/net/dst.h')
| -rw-r--r-- | include/net/dst.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/net/dst.h b/include/net/dst.h index 39c4a59..ce078cda 100644 --- a/include/net/dst.h +++ b/include/net/dst.h @@ -83,8 +83,6 @@ struct dst_entry { * (L1_CACHE_SIZE would be too much) */ #ifdef CONFIG_64BIT - long __pad_to_align_refcnt[2]; -#else long __pad_to_align_refcnt[1]; #endif /* |
