git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
[pandora-kernel.git]
/
sound
/
oss
/
os.h
diff --git
a/sound/oss/os.h
b/sound/oss/os.h
index
80dce32
..
a1a962d
100644
(file)
--- a/
sound/oss/os.h
+++ b/
sound/oss/os.h
@@
-5,10
+5,8
@@
#undef DO_TIMINGS
#include <linux/module.h>
#undef DO_TIMINGS
#include <linux/module.h>
-#include <linux/version.h>
#ifdef __KERNEL__
#ifdef __KERNEL__
-#include <linux/utsname.h>
#include <linux/string.h>
#include <linux/fs.h>
#include <asm/dma.h>
#include <linux/string.h>
#include <linux/fs.h>
#include <asm/dma.h>
@@
-45,4
+43,4
@@
extern int sound_nblocks;
#undef PSEUDO_DMA_AUTOINIT
#define ALLOW_BUFFER_MAPPING
#undef PSEUDO_DMA_AUTOINIT
#define ALLOW_BUFFER_MAPPING
-extern struct file_operations oss_sound_fops;
+extern
const
struct file_operations oss_sound_fops;