diff options
| author | James Morris <jmorris@namei.org> | 2008-11-06 02:12:34 +0300 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2008-11-06 02:12:34 +0300 |
| commit | e21e696edb498c7f7eed42ba3096f6bbe13927b6 (patch) | |
| tree | 73b0bc28e45b0268f05c4b384a17bfb2140a73bc /drivers/ieee1394/raw1394-private.h | |
| parent | 2f99db28af90957271a6448479c3e492ccf7c697 (diff) | |
| parent | 75fa67706cce5272bcfc51ed646f2da21f3bdb6e (diff) | |
| download | linux-e21e696edb498c7f7eed42ba3096f6bbe13927b6.tar.xz | |
Merge branch 'master' into next
Diffstat (limited to 'drivers/ieee1394/raw1394-private.h')
| -rw-r--r-- | drivers/ieee1394/raw1394-private.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/ieee1394/raw1394-private.h b/drivers/ieee1394/raw1394-private.h index a06aaad5b448..7a225a405987 100644 --- a/drivers/ieee1394/raw1394-private.h +++ b/drivers/ieee1394/raw1394-private.h @@ -22,6 +22,7 @@ enum raw1394_iso_state { RAW1394_ISO_INACTIVE = 0, struct file_info { struct list_head list; + struct mutex state_mutex; enum { opened, initialized, connected } state; unsigned int protocol_version; |