Merge branch 'master' into upstream

[sfrench/cifs-2.6.git] / sound / oss / os.h

diff --git a/sound/oss/os.h b/sound/oss/os.h
index 80dce329cc3a65d8d0a9fcef8793370c415a2687..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>