diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-19 13:07:19 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-19 13:07:19 -0800 |
| commit | 920841d8d1d61bc12b43f95a579a5374f6d98f81 (patch) | |
| tree | 413be4ee2a75bb523d6e829ef0e52057f408222e /drivers/ieee1394/ieee1394-ioctl.h | |
| parent | 5c56f466835d20fc4f7119063a8c029f7170a317 (diff) | |
| parent | a65421ea3f8a0e78b4e3b858bdc5ada5ad653807 (diff) | |
| download | kernel-crypto-920841d8d1d61bc12b43f95a579a5374f6d98f81.tar.gz kernel-crypto-920841d8d1d61bc12b43f95a579a5374f6d98f81.tar.xz kernel-crypto-920841d8d1d61bc12b43f95a579a5374f6d98f81.zip | |
Merge branch 'for-linus' of ssh://master.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6
* 'for-linus' of ssh://master.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6:
ieee1394: fix another deadlock in nodemgr
ieee1394: cycle timer read extension for raw1394
Diffstat (limited to 'drivers/ieee1394/ieee1394-ioctl.h')
| -rw-r--r-- | drivers/ieee1394/ieee1394-ioctl.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/ieee1394/ieee1394-ioctl.h b/drivers/ieee1394/ieee1394-ioctl.h index 8f207508ed1..46878fef136 100644 --- a/drivers/ieee1394/ieee1394-ioctl.h +++ b/drivers/ieee1394/ieee1394-ioctl.h @@ -100,5 +100,7 @@ _IO ('#', 0x28) #define RAW1394_IOC_ISO_RECV_FLUSH \ _IO ('#', 0x29) +#define RAW1394_IOC_GET_CYCLE_TIMER \ + _IOR ('#', 0x30, struct raw1394_cycle_timer) #endif /* __IEEE1394_IOCTL_H */ |