Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6:
  ieee1394: schedule for removal
  firewire: core: use separate timeout for each transaction
  firewire: core: Fix tlabel exhaustion problem
  firewire: core: make transaction label allocation more robust
  firewire: core: clean up config ROM related defined constants
  ieee1394: mark char device files as not seekable
  firewire: cdev: mark char device files as not seekable
  firewire: ohci: cleanups and fix for nonstandard build without debug facility
  firewire: ohci: wait for PHY register accesses to complete
  firewire: ohci: fix up configuration of TI chips
  firewire: ohci: enable 1394a enhancements
  firewire: ohci: do not clear PHY interrupt status inadvertently
  firewire: ohci: add a function for reading PHY registers

Trivial conflicts in Documentation/feature-removal-schedule.txt

1 files changed, 4 insertions, 4 deletions

diff --git a/drivers/firewire/core-cdev.c b/drivers/firewire/core-cdev.c
index 14a34d99eea..5bf106b9d79 100644
--- a/drivers/firewire/core-cdev.c
+++ b/drivers/firewire/core-cdev.c
@@ -227,7 +227,7 @@ static int fw_device_op_open(struct inode *inode, struct file *file)
         list_add_tail(&client->link, &device->client_list);
         mutex_unlock(&device->client_list_mutex);
 
-        return 0;
+        return nonseekable_open(inode, file);
 }
 
 static void queue_event(struct client *client, struct event *event,
@@ -1496,13 +1496,13 @@ static unsigned int fw_device_op_poll(struct file *file, poll_table * pt)
 
 const struct file_operations fw_device_ops = {
         .owner          = THIS_MODULE,
+        .llseek         = no_llseek,
         .open           = fw_device_op_open,
         .read           = fw_device_op_read,
         .unlocked_ioctl = fw_device_op_ioctl,
-        .poll           = fw_device_op_poll,
-        .release        = fw_device_op_release,
         .mmap           = fw_device_op_mmap,
-
+        .release        = fw_device_op_release,
+        .poll           = fw_device_op_poll,
 #ifdef CONFIG_COMPAT
         .compat_ioctl   = fw_device_op_compat_ioctl,
 #endif