Merge 2.4 update to ariadne net driver:

remove unneeded asm/io.h include

diff --git a/drivers/net/ariadne.c b/drivers/net/ariadne.c
index 55b8ee981fc72d91e2110b5db0e826fcfcb47a37..fd0850a571a8895e618cf048a89f12af3ad34818 100644 (file)
--- a/drivers/net/ariadne.c
+++ b/drivers/net/ariadne.c
@@ -54,7 +54,7 @@
 #include <asm/amigaints.h>
 #include <asm/amigahw.h>
 #include <linux/zorro.h>
-#include <asm/io.h>
+
 #include <asm/irq.h>
 
 #include "ariadne.h"