diff options
author | Takashi Iwai <tiwai@suse.de> | 2011-10-26 23:51:43 +0200 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2011-10-26 23:51:43 +0200 |
commit | d22665702226e9c40bc331098559e3d55e7cd43d (patch) | |
tree | 6e92734c9835dc9e064b20182624939f3486d28d /sound/firewire/isight.c | |
parent | 5cdf745ebae0f5bcf9b798d8fd5cb57add592cc1 (diff) | |
parent | dde7ad8dee274763c8958769779aea8c993c950e (diff) | |
download | talos-op-linux-d22665702226e9c40bc331098559e3d55e7cd43d.tar.gz talos-op-linux-d22665702226e9c40bc331098559e3d55e7cd43d.zip |
Merge branch 'topic/misc' into for-linus
Diffstat (limited to 'sound/firewire/isight.c')
-rw-r--r-- | sound/firewire/isight.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sound/firewire/isight.c b/sound/firewire/isight.c index 440030818db7..cd094ecaca3b 100644 --- a/sound/firewire/isight.c +++ b/sound/firewire/isight.c @@ -51,7 +51,6 @@ struct isight { struct fw_unit *unit; struct fw_device *device; u64 audio_base; - struct fw_address_handler iris_handler; struct snd_pcm_substream *pcm; struct mutex mutex; struct iso_packets_buffer buffer; |