revert "memory hotplug: allocate usemap on the section with pgdat"

[linux-2.6-omap-h63xx.git] / drivers / ieee1394 / raw1394.h

diff --git a/drivers/ieee1394/raw1394.h b/drivers/ieee1394/raw1394.h
index 35bfc38f013c25f681dda5f3a70c2fbfed6c1819..963ac20373d20c860ac7d4f89e5db819b68cfbae 100644 (file)
--- a/drivers/ieee1394/raw1394.h
+++ b/drivers/ieee1394/raw1394.h
@@ -17,11 +17,11 @@
 #define RAW1394_REQ_ASYNC_WRITE     101
 #define RAW1394_REQ_LOCK            102
 #define RAW1394_REQ_LOCK64          103
-#define RAW1394_REQ_ISO_SEND        104
+#define RAW1394_REQ_ISO_SEND        104 /* removed ABI, now a no-op */
 #define RAW1394_REQ_ASYNC_SEND      105
 #define RAW1394_REQ_ASYNC_STREAM    106
 
-#define RAW1394_REQ_ISO_LISTEN      200
+#define RAW1394_REQ_ISO_LISTEN      200 /* removed ABI, now a no-op */
 #define RAW1394_REQ_FCP_LISTEN      201
 #define RAW1394_REQ_RESET_BUS       202
 #define RAW1394_REQ_GET_ROM         203
@@ -178,4 +178,14 @@ struct raw1394_iso_status {
        __s16 xmit_cycle;
 };
 
+/* argument to RAW1394_IOC_GET_CYCLE_TIMER ioctl */
+struct raw1394_cycle_timer {
+       /* contents of Isochronous Cycle Timer register,
+          as in OHCI 1.1 clause 5.13 (also with non-OHCI hosts) */
+       __u32 cycle_timer;
+
+       /* local time in microseconds since Epoch,
+          simultaneously read with cycle timer */
+       __u64 local_time;
+};
 #endif /* IEEE1394_RAW1394_H */