diff options
| author | Takashi Iwai <tiwai@suse.de> | 2014-05-27 19:38:08 +0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2014-05-27 19:38:08 +0400 |
| commit | a58bdba749b36069ec372da9c9fd16017b6c0b47 (patch) | |
| tree | 95c79448427425d1c05712a7c7fb98ed42e41539 /drivers/firewire | |
| parent | 00a6d7b6762c27d441e9ac8faff36384bc0fc180 (diff) | |
| parent | 51fa31d462f32e1ffdf957802dcab1dc20d2f243 (diff) | |
| download | linux-a58bdba749b36069ec372da9c9fd16017b6c0b47.tar.xz | |
Merge branch 'topic/firewire' into for-next
This is a merge of big firewire audio stack updates by Takashi Sakamoto.
Diffstat (limited to 'drivers/firewire')
| -rw-r--r-- | drivers/firewire/core.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/firewire/core.h b/drivers/firewire/core.h index c98764aeeec6..870044e82316 100644 --- a/drivers/firewire/core.h +++ b/drivers/firewire/core.h @@ -118,7 +118,6 @@ int fw_card_add(struct fw_card *card, u32 max_receive, u32 link_speed, u64 guid); void fw_core_remove_card(struct fw_card *card); int fw_compute_block_crc(__be32 *block); -void fw_schedule_bus_reset(struct fw_card *card, bool delayed, bool short_reset); void fw_schedule_bm_work(struct fw_card *card, unsigned long delay); /* -cdev */ |