diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2010-12-30 00:20:30 -0500 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2010-12-30 00:21:47 -0500 |
| commit | d392da5207352f09030e95d9ea335a4225667ec0 (patch) | |
| tree | 7d6cd1932afcad0a5619a5c504a6d93ca318187c /drivers/spi/spidev.c | |
| parent | e39d5ef678045d61812c1401f04fe8edb14d6359 (diff) | |
| parent | 387c31c7e5c9805b0aef8833d1731a5fe7bdea14 (diff) | |
Merge v2.6.37-rc8 into powerpc/next
Diffstat (limited to 'drivers/spi/spidev.c')
| -rw-r--r-- | drivers/spi/spidev.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/spi/spidev.c b/drivers/spi/spidev.c index ea1bec3c9a13..4e6245e67995 100644 --- a/drivers/spi/spidev.c +++ b/drivers/spi/spidev.c | |||
| @@ -545,6 +545,7 @@ static const struct file_operations spidev_fops = { | |||
| 545 | .unlocked_ioctl = spidev_ioctl, | 545 | .unlocked_ioctl = spidev_ioctl, |
| 546 | .open = spidev_open, | 546 | .open = spidev_open, |
| 547 | .release = spidev_release, | 547 | .release = spidev_release, |
| 548 | .llseek = no_llseek, | ||
| 548 | }; | 549 | }; |
| 549 | 550 | ||
| 550 | /*-------------------------------------------------------------------------*/ | 551 | /*-------------------------------------------------------------------------*/ |