diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-03-28 22:27:45 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-03-28 22:27:45 +0100 |
commit | 3fab191002b184e4390aa07c7149c6cc7b638ec7 (patch) | |
tree | 821382d49e47c19531bfc3bb9e1f8922486374d4 /drivers/infiniband/hw/amso1100/c2.h | |
parent | Merge branches 'x86/apic', 'x86/cleanups' and 'x86/mm' into x86/core (diff) | |
parent | Merge branch 'percpu-cpumask-x86-for-linus-2' of git://git.kernel.org/pub/scm... (diff) | |
download | linux-3fab191002b184e4390aa07c7149c6cc7b638ec7.tar.xz linux-3fab191002b184e4390aa07c7149c6cc7b638ec7.zip |
Merge branch 'linus' into x86/core
Diffstat (limited to 'drivers/infiniband/hw/amso1100/c2.h')
-rw-r--r-- | drivers/infiniband/hw/amso1100/c2.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/infiniband/hw/amso1100/c2.h b/drivers/infiniband/hw/amso1100/c2.h index d12a24a84fd9..f7ff66f98361 100644 --- a/drivers/infiniband/hw/amso1100/c2.h +++ b/drivers/infiniband/hw/amso1100/c2.h @@ -369,8 +369,6 @@ struct c2_port { unsigned long mem_size; u32 rx_buf_size; - - struct net_device_stats netstats; }; /* |