diff options
| author | <jgarzik@pretzel.yyz.us> | 2005-05-26 21:40:25 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-05-26 21:40:25 -0400 |
| commit | 462cee296476278acaa54c41925b3273e0e4dd40 (patch) | |
| tree | c9d9fcfc4dd62807cb67678a6eda0151bfa8be95 /drivers/ieee1394/ieee1394_transactions.c | |
| parent | 126fa4b9ca5d9d7cb7d46f779ad3bd3631ca387c (diff) | |
| parent | 4ec5240ec367a592834385893200dd4fb369354c (diff) | |
Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/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 */ | ||