Merge tag 'v2.6.37' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / arch / cris / arch-v10 / drivers / gpio.c

diff --git a/arch/cris/arch-v10/drivers/gpio.c b/arch/cris/arch-v10/drivers/gpio.c
index a07b6d25b0c7956eb6e4a6fd36aa070a75a6a140..a276f0811731c8d0b3bb68f30c1bb3173a1c5e75 100644 (file)
--- a/arch/cris/arch-v10/drivers/gpio.c
+++ b/arch/cris/arch-v10/drivers/gpio.c
@@ -745,6 +745,7 @@ static const struct file_operations gpio_fops = {
        .write          = gpio_write,
        .open           = gpio_open,
        .release        = gpio_release,
+       .llseek         = noop_llseek,
 };
 
 static void ioif_watcher(const unsigned int gpio_in_available,