diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-10-08 15:01:33 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-10-08 15:01:33 +1100 |
| commit | 3c43ddec936bcc591c7885fb9a8e596dcce24b47 (patch) | |
| tree | 0f0f494c512da962bd9df59576a543ab0aa3490e /drivers/staging/dream/qdsp5/audio_in.c | |
| parent | bb46252c0f5b1146c63b8896a93c8fe03daa02c4 (diff) | |
| parent | 9599bc4b997ccd416665c66ab6ea090163c7432c (diff) | |
Merge remote branch 'bkl-llseek/llseek'
Conflicts:
drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
drivers/infiniband/hw/cxgb4/device.c
Diffstat (limited to 'drivers/staging/dream/qdsp5/audio_in.c')
| -rw-r--r-- | drivers/staging/dream/qdsp5/audio_in.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/staging/dream/qdsp5/audio_in.c b/drivers/staging/dream/qdsp5/audio_in.c index 6ae48e72d145..b51fa096074e 100644 --- a/drivers/staging/dream/qdsp5/audio_in.c +++ b/drivers/staging/dream/qdsp5/audio_in.c @@ -921,12 +921,14 @@ static struct file_operations audio_fops = { .read = audio_in_read, .write = audio_in_write, .unlocked_ioctl = audio_in_ioctl, + .llseek = noop_llseek, }; static struct file_operations audpre_fops = { .owner = THIS_MODULE, .open = audpre_open, .unlocked_ioctl = audpre_ioctl, + .llseek = noop_llseek, }; struct miscdevice audio_in_misc = { |