Merge branch 'for-linus' of git://git.kernel.dk/data/git/linux-2.6-block

[mv-sheeva.git] / sound / oss / vwsnd.c

diff --git a/sound/oss/vwsnd.c b/sound/oss/vwsnd.c
index 6dfb9f4b03ec9c0fae1df528ec9245f226ab50ed..d25249a932bfa48abe544bfa7dac49ba0a3e17e7 100644 (file)
--- a/sound/oss/vwsnd.c
+++ b/sound/oss/vwsnd.c
@@ -3035,7 +3035,7 @@ static int vwsnd_audio_release(struct inode *inode, struct file *file)
        return err;
 }
 
-static struct file_operations vwsnd_audio_fops = {
+static const struct file_operations vwsnd_audio_fops = {
        .owner =        THIS_MODULE,
        .llseek =       no_llseek,
        .read =         vwsnd_audio_read,
@@ -3225,7 +3225,7 @@ static int vwsnd_mixer_ioctl(struct inode *ioctl,
        return retval;
 }
 
-static struct file_operations vwsnd_mixer_fops = {
+static const struct file_operations vwsnd_mixer_fops = {
        .owner =        THIS_MODULE,
        .llseek =       no_llseek,
        .ioctl =        vwsnd_mixer_ioctl,