diff options
| author | Takashi Iwai <tiwai@suse.de> | 2016-02-10 01:08:48 +0300 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2016-02-10 01:08:48 +0300 |
| commit | 9b88daa5137f15c051e5673dd2ce9acf678f84dc (patch) | |
| tree | 5f9bdcaa275b0757a12e9dd2327a86249eeb4302 /sound/firewire/tascam/tascam.h | |
| parent | dfabc0eee1400b910d9e0f4bc55af8d2797927d2 (diff) | |
| parent | 397da2d0ab0d1398242622d80a74df7245395c63 (diff) | |
| download | linux-9b88daa5137f15c051e5673dd2ce9acf678f84dc.tar.xz | |
Merge branch 'for-linus' into for-next
Diffstat (limited to 'sound/firewire/tascam/tascam.h')
| -rw-r--r-- | sound/firewire/tascam/tascam.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/sound/firewire/tascam/tascam.h b/sound/firewire/tascam/tascam.h index 2d028d2bd3bd..30ab77e924f7 100644 --- a/sound/firewire/tascam/tascam.h +++ b/sound/firewire/tascam/tascam.h @@ -39,7 +39,6 @@ struct snd_tscm_spec { unsigned int pcm_playback_analog_channels; unsigned int midi_capture_ports; unsigned int midi_playback_ports; - bool is_controller; }; #define TSCM_MIDI_IN_PORT_MAX 4 @@ -72,9 +71,6 @@ struct snd_tscm { struct snd_fw_async_midi_port out_ports[TSCM_MIDI_OUT_PORT_MAX]; u8 running_status[TSCM_MIDI_OUT_PORT_MAX]; bool on_sysex[TSCM_MIDI_OUT_PORT_MAX]; - - /* For control messages. */ - struct snd_firewire_tascam_status *status; }; #define TSCM_ADDR_BASE 0xffff00000000ull |