diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2006-09-27 20:57:54 +0200 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2006-09-27 20:57:54 +0200 |
commit | 2dc94310bd94d0906febea7d0f7c188da620c952 (patch) | |
tree | 6de4096f1887e2c00966177354b1c378e59bd632 /drivers/net/netx-eth.c | |
parent | [ARM] 3860/1: Versatile PCI config byte accesses (diff) | |
parent | ARM: OMAP: Remove common pm.c (diff) | |
download | linux-2dc94310bd94d0906febea7d0f7c188da620c952.tar.xz linux-2dc94310bd94d0906febea7d0f7c188da620c952.zip |
Merge master.kernel.org:/pub/scm/linux/kernel/git/tmlind/linux-omap-upstream into devel
Diffstat (limited to 'drivers/net/netx-eth.c')
-rw-r--r-- | drivers/net/netx-eth.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/netx-eth.c b/drivers/net/netx-eth.c index b1311ae82675..30ed9a5a40e0 100644 --- a/drivers/net/netx-eth.c +++ b/drivers/net/netx-eth.c @@ -17,7 +17,6 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include <linux/config.h> #include <linux/init.h> #include <linux/module.h> #include <linux/kernel.h> |