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.c | |
| parent | f497ba735fc9ff4e35a19641143708b3be1c7061 (diff) | |
| parent | 8be3de3fd8469154a2b3e18a4712032dac5b4a53 (diff) | |
Automatic merge of /spare/repo/linux-2.6/.git branch HEAD
Diffstat (limited to 'drivers/ieee1394/ieee1394_transactions.c')
| -rw-r--r-- | drivers/ieee1394/ieee1394_transactions.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/ieee1394/ieee1394_transactions.c b/drivers/ieee1394/ieee1394_transactions.c index 09908b9564d8..0aa876360f9b 100644 --- a/drivers/ieee1394/ieee1394_transactions.c +++ b/drivers/ieee1394/ieee1394_transactions.c | |||
| @@ -535,6 +535,7 @@ hpsb_write_fail: | |||
| 535 | return retval; | 535 | return retval; |
| 536 | } | 536 | } |
| 537 | 537 | ||
| 538 | #if 0 | ||
| 538 | 539 | ||
| 539 | int hpsb_lock(struct hpsb_host *host, nodeid_t node, unsigned int generation, | 540 | int hpsb_lock(struct hpsb_host *host, nodeid_t node, unsigned int generation, |
| 540 | u64 addr, int extcode, quadlet_t *data, quadlet_t arg) | 541 | u64 addr, int extcode, quadlet_t *data, quadlet_t arg) |
| @@ -599,3 +600,5 @@ int hpsb_send_gasp(struct hpsb_host *host, int channel, unsigned int generation, | |||
| 599 | 600 | ||
| 600 | return retval; | 601 | return retval; |
| 601 | } | 602 | } |
| 603 | |||
| 604 | #endif /* 0 */ | ||