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/char/scx200_gpio.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/char/scx200_gpio.c')
| -rw-r--r-- | drivers/char/scx200_gpio.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/char/scx200_gpio.c b/drivers/char/scx200_gpio.c index 99e5272e3c53..0bc135b9b16f 100644 --- a/drivers/char/scx200_gpio.c +++ b/drivers/char/scx200_gpio.c @@ -67,6 +67,7 @@ static const struct file_operations scx200_gpio_fileops = { .read = nsc_gpio_read, .open = scx200_gpio_open, .release = scx200_gpio_release, + .llseek = no_llseek, }; static struct cdev scx200_gpio_cdev; /* use 1 cdev for all pins */ |