diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-10-01 14:49:01 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-10-01 14:49:01 +1000 |
| commit | 241c573c2059538e220fb61b7abdd7b869b9ce1c (patch) | |
| tree | d4b5978cd32aace642f285973e22c2639c6e461c /arch/avr32 | |
| parent | 8f73439b6dd516613a31fe040ad655ce953c96ce (diff) | |
| parent | 9599bc4b997ccd416665c66ab6ea090163c7432c (diff) | |
Merge remote branch 'bkl-llseek/llseek'
Conflicts:
drivers/infiniband/hw/cxgb4/device.c
Diffstat (limited to 'arch/avr32')
| -rw-r--r-- | arch/avr32/boards/mimc200/fram.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/avr32/boards/mimc200/fram.c b/arch/avr32/boards/mimc200/fram.c index 54fbd95cee9b..9764a1a1073e 100644 --- a/arch/avr32/boards/mimc200/fram.c +++ b/arch/avr32/boards/mimc200/fram.c @@ -41,6 +41,7 @@ static int fram_mmap(struct file *filp, struct vm_area_struct *vma) static const struct file_operations fram_fops = { .owner = THIS_MODULE, .mmap = fram_mmap, + .llseek = noop_llseek, }; #define FRAM_MINOR 0 |