Merge commit 'v2.6.37-rc1' into for-2.6.37

[net-next-2.6.git] / sound / core / seq / oss / seq_oss.c

diff --git a/sound/core/seq/oss/seq_oss.c b/sound/core/seq/oss/seq_oss.c
index f25e3cc7ddfa53b4aa9244abe3fdf776146d7958..a1f1a2f00ccb6f1398a17bcab473908420b82a24 100644 (file)
--- a/sound/core/seq/oss/seq_oss.c
+++ b/sound/core/seq/oss/seq_oss.c
@@ -220,6 +220,7 @@ static const struct file_operations seq_oss_f_ops =
        .poll =         odev_poll,
        .unlocked_ioctl =       odev_ioctl,
        .compat_ioctl = odev_ioctl_compat,
+       .llseek =       noop_llseek,
 };
 
 static int __init