summaryrefslogtreecommitdiffstats
path: root/sound/oss/os.h
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2005-11-12 05:39:35 +0100
committerJeff Garzik <jgarzik@pobox.com>2005-11-12 05:39:35 +0100
commitf4256e301d9800b1e0276404cb01b3ac85b51067 (patch)
tree975f56627b78f757608b31684311a24ca1478481 /sound/oss/os.h
parentMerge branch 'upstream' (diff)
parentLinux v2.6.15-rc1 (diff)
downloadlinux-f4256e301d9800b1e0276404cb01b3ac85b51067.tar.xz
linux-f4256e301d9800b1e0276404cb01b3ac85b51067.zip
Merge branch 'master'
Diffstat (limited to 'sound/oss/os.h')
-rw-r--r--sound/oss/os.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/sound/oss/os.h b/sound/oss/os.h
index 80dce329cc3a..0490562c7f7f 100644
--- 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>