diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2008-09-04 08:08:42 -0700 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2008-09-04 08:08:42 -0700 |
| commit | 7203781c98ad9147564d327de6f6513ad8fc0f4e (patch) | |
| tree | 5c29a2a04a626bf08a0d56fd8a0068b3c92ad284 /drivers/net/netxen/netxen_nic_hdr.h | |
| parent | 671eef85a3e885dff4ce210d8774ad50a91d5967 (diff) | |
| parent | af2e1f276ff08f17192411ea3b71c13a758dfe12 (diff) | |
| download | talos-obmc-linux-7203781c98ad9147564d327de6f6513ad8fc0f4e.tar.gz talos-obmc-linux-7203781c98ad9147564d327de6f6513ad8fc0f4e.zip | |
Merge branch 'x86/cpu' into x86/core
Conflicts:
arch/x86/kernel/cpu/feature_names.c
include/asm-x86/cpufeature.h
Diffstat (limited to 'drivers/net/netxen/netxen_nic_hdr.h')
| -rw-r--r-- | drivers/net/netxen/netxen_nic_hdr.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/net/netxen/netxen_nic_hdr.h b/drivers/net/netxen/netxen_nic_hdr.h index e8e8d73f6ed7..e80f9e3e5973 100644 --- a/drivers/net/netxen/netxen_nic_hdr.h +++ b/drivers/net/netxen/netxen_nic_hdr.h @@ -32,8 +32,6 @@ #include <linux/module.h> #include <linux/kernel.h> -#include <linux/version.h> - #include <linux/spinlock.h> #include <asm/irq.h> #include <linux/init.h> |
