Merge branch 'master' into tk71

[mv-sheeva.git] / drivers / spi / spidev.c

diff --git a/drivers/spi/spidev.c b/drivers/spi/spidev.c
index ea1bec3c9a13359a4058a762e9f2f8de7755cc36..603428213d2185d980f99db6850e89aee2e89355 100644 (file)
--- a/drivers/spi/spidev.c
+++ b/drivers/spi/spidev.c
@@ -38,7 +38,7 @@
 
 
 /*
- * This supports acccess to SPI devices using normal userspace I/O calls.
+ * This supports access to SPI devices using normal userspace I/O calls.
  * Note that while traditional UNIX/POSIX I/O semantics are half duplex,
  * and often mask message boundaries, full SPI support requires full duplex
  * transfers.  There are several kinds of internal message boundaries to
@@ -545,6 +545,7 @@ static const struct file_operations spidev_fops = {
        .unlocked_ioctl = spidev_ioctl,
        .open =         spidev_open,
        .release =      spidev_release,
+       .llseek =       no_llseek,
 };
 
 /*-------------------------------------------------------------------------*/