Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm

[pandora-kernel.git] / fs / fifo.c

diff --git a/fs/fifo.c b/fs/fifo.c
index 5d6606f..b1a524d 100644 (file)
--- a/fs/fifo.c
+++ b/fs/fifo.c
@@ -66,8 +66,7 @@ static int fifo_open(struct inode *inode, struct file *filp)
                                /* suppress POLLHUP until we have
                                 * seen a writer */
                                filp->f_version = pipe->w_counter;
-                       } else 
-                       {
+                       } else {
                                wait_for_partner(inode, &pipe->w_counter);
                                if(signal_pending(current))
                                        goto err_rd;
@@ -151,4 +150,5 @@ err_nocleanup:
  */
 const struct file_operations def_fifo_fops = {
        .open           = fifo_open,    /* will set read_ or write_pipefifo_fops */
+       .llseek         = noop_llseek,
 };