Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm

[mv-sheeva.git] / sound / oss / os.h

diff --git a/sound/oss/os.h b/sound/oss/os.h
index d6b96297835ca8b2ab284d4a1920c59848177f15..0490562c7f7f03d8bed5f945ee4f30943721f64b 100644 (file)
--- a/sound/oss/os.h
+++ b/sound/oss/os.h
@@ -5,10 +5,8 @@
 #undef  DO_TIMINGS
 
 #include <linux/module.h>
-#include <linux/version.h>
 
 #ifdef __KERNEL__
-#include <linux/utsname.h>
 #include <linux/string.h>
 #include <linux/fs.h>
 #include <asm/dma.h>
@@ -19,9 +17,6 @@
 #include <linux/ioport.h>
 #include <asm/page.h>
 #include <asm/system.h>
-#ifdef __alpha__
-#include <asm/segment.h>
-#endif
 #include <linux/vmalloc.h>
 #include <asm/uaccess.h>
 #include <linux/poll.h>