diff options
| author | <jgarzik@pretzel.yyz.us> | 2005-06-04 00:40:40 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-06-04 00:40:40 -0400 |
| commit | ae20ea8525a80a863f70d332cf47b71bd9f54c1f (patch) | |
| tree | 9d3cedeb65db521a8436b545bd91641549a18d24 /drivers/ieee1394/ieee1394_transactions.h | |
| parent | f497ba735fc9ff4e35a19641143708b3be1c7061 (diff) | |
| parent | 8be3de3fd8469154a2b3e18a4712032dac5b4a53 (diff) | |
Automatic merge of /spare/repo/linux-2.6/.git branch HEAD
Diffstat (limited to 'drivers/ieee1394/ieee1394_transactions.h')
| -rw-r--r-- | drivers/ieee1394/ieee1394_transactions.h | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/drivers/ieee1394/ieee1394_transactions.h b/drivers/ieee1394/ieee1394_transactions.h index 526a43ceb496..45ba784fe6da 100644 --- a/drivers/ieee1394/ieee1394_transactions.h +++ b/drivers/ieee1394/ieee1394_transactions.h | |||
| @@ -53,12 +53,5 @@ int hpsb_read(struct hpsb_host *host, nodeid_t node, unsigned int generation, | |||
| 53 | u64 addr, quadlet_t *buffer, size_t length); | 53 | u64 addr, quadlet_t *buffer, size_t length); |
| 54 | int hpsb_write(struct hpsb_host *host, nodeid_t node, unsigned int generation, | 54 | int hpsb_write(struct hpsb_host *host, nodeid_t node, unsigned int generation, |
| 55 | u64 addr, quadlet_t *buffer, size_t length); | 55 | u64 addr, quadlet_t *buffer, size_t length); |
| 56 | int hpsb_lock(struct hpsb_host *host, nodeid_t node, unsigned int generation, | ||
| 57 | u64 addr, int extcode, quadlet_t *data, quadlet_t arg); | ||
| 58 | int hpsb_lock64(struct hpsb_host *host, nodeid_t node, unsigned int generation, | ||
| 59 | u64 addr, int extcode, octlet_t *data, octlet_t arg); | ||
| 60 | int hpsb_send_gasp(struct hpsb_host *host, int channel, unsigned int generation, | ||
| 61 | quadlet_t *buffer, size_t length, u32 specifier_id, | ||
| 62 | unsigned int version); | ||
| 63 | 56 | ||
| 64 | #endif /* _IEEE1394_TRANSACTIONS_H */ | 57 | #endif /* _IEEE1394_TRANSACTIONS_H */ |