diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-08-15 16:16:15 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-08-15 16:16:15 +0200 |
| commit | 1a10390708d675ebf1a2f5e169a5165626afbd88 (patch) | |
| tree | d9ee7d10abd65e580fb74152a501089f51174225 /drivers/net/ixp2000/ixpdev.c | |
| parent | 239bd83104ec6bcba90221d8b0973d2565142ef8 (diff) | |
| parent | b635acec48bcaa9183fcbf4e3955616b0d4119b5 (diff) | |
| download | talos-op-linux-1a10390708d675ebf1a2f5e169a5165626afbd88.tar.gz talos-op-linux-1a10390708d675ebf1a2f5e169a5165626afbd88.zip | |
Merge branch 'linus' into x86/cpu
Diffstat (limited to 'drivers/net/ixp2000/ixpdev.c')
| -rw-r--r-- | drivers/net/ixp2000/ixpdev.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/ixp2000/ixpdev.c b/drivers/net/ixp2000/ixpdev.c index 7111c65f0b30..7b70c66504a0 100644 --- a/drivers/net/ixp2000/ixpdev.c +++ b/drivers/net/ixp2000/ixpdev.c @@ -16,7 +16,6 @@ #include <linux/init.h> #include <linux/moduleparam.h> #include <asm/hardware/uengine.h> -#include <asm/mach-types.h> #include <asm/io.h> #include "ixp2400_rx.ucode" #include "ixp2400_tx.ucode" |
