Merge branch 'devel'

[linux-2.6-omap-h63xx.git] / drivers / char / rio / rioctrl.c

diff --git a/drivers/char/rio/rioctrl.c b/drivers/char/rio/rioctrl.c
index 7ce77619707cf2f4fa1db2480d1acaebaf968ca9..d8eb2bcbe015dca54fce742555ec18142cb7851c 100644 (file)
--- a/drivers/char/rio/rioctrl.c
+++ b/drivers/char/rio/rioctrl.c
@@ -40,7 +40,6 @@ static char *_rioctrl_c_sccs_ = "@(#)rioctrl.c        1.3";
 #include <asm/io.h>
 #include <asm/system.h>
 #include <asm/string.h>
-#include <asm/semaphore.h>
 #include <asm/uaccess.h>
 
 #include <linux/termios.h>