patch-2.3.10 linux/drivers/sbus/char/bpp.c

Next file: linux/drivers/sbus/char/sab82532.c
Previous file: linux/drivers/pnp/parport_probe.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.3.9/linux/drivers/sbus/char/bpp.c linux/drivers/sbus/char/bpp.c
@@ -20,10 +20,10 @@
 #include <linux/ioport.h>
 #include <linux/major.h>
 
-#include  <asm/uaccess.h>
+#include <asm/uaccess.h>
+#include <asm/io.h>
 
 #if defined(__i386__)
-# include <asm/io.h>
 # include <asm/system.h>
 # include <asm/segment.h>
 #endif
@@ -34,7 +34,6 @@
 
 # include <asm/oplib.h>           /* OpenProm Library */
 # include <asm/sbus.h>            /* struct linux_sbus *SBus_chain */
-# include <asm/io.h>              /* sparc_alloc_io() */
 #endif
 
 #include <asm/bpp.h>

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)