Merge master.kernel.org:/pub/scm/linux/kernel/git/sfrench/cifs-2.6

[linux-2.6-omap-h63xx.git] / drivers / char / rio / linux_compat.h

diff --git a/drivers/char/rio/linux_compat.h b/drivers/char/rio/linux_compat.h
index ebbe3ea873e8e04a47b047b3837ec60ebb877433..34c0d2899ef19c6918722e346ad4c8a7e71d61c9 100644 (file)
--- a/drivers/char/rio/linux_compat.h
+++ b/drivers/char/rio/linux_compat.h
@@ -25,10 +25,6 @@ struct ttystatics {
        struct termios tm;
 };
 
-#define bcopy(src, dest, n) memcpy ((dest), (src), (n))
-
-#define SEM_SIGIGNORE 0x1234
-
 extern int rio_debug;
 
 #define RIO_DEBUG_INIT         0x000001