diff options
| author | Stefan Agner <stefan@agner.ch> | 2016-06-02 12:22:30 -0700 |
|---|---|---|
| committer | Max Krummenacher <max.krummenacher@toradex.com> | 2017-03-15 18:35:46 +0100 |
| commit | 440ef98ad687b210dca17e5c5141b24738f04922 (patch) | |
| tree | 036c3507db3d4250cff096e825fc90897e485a3c /sound/core/seq/oss/seq_oss_device.h | |
| parent | de1c77640710e1cca36091c8e6d7947bff2397e7 (diff) | |
| parent | 648d744eff1aedea4ffe49dfca07aa465669e1f4 (diff) | |
Merge tag 'v4.1.24' into toradex_vf_4.1-next
Linux 4.1.24
Diffstat (limited to 'sound/core/seq/oss/seq_oss_device.h')
| -rw-r--r-- | sound/core/seq/oss/seq_oss_device.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sound/core/seq/oss/seq_oss_device.h b/sound/core/seq/oss/seq_oss_device.h index b43924325249..d7b4d016b547 100644 --- a/sound/core/seq/oss/seq_oss_device.h +++ b/sound/core/seq/oss/seq_oss_device.h @@ -127,7 +127,6 @@ int snd_seq_oss_write(struct seq_oss_devinfo *dp, const char __user *buf, int co unsigned int snd_seq_oss_poll(struct seq_oss_devinfo *dp, struct file *file, poll_table * wait); void snd_seq_oss_reset(struct seq_oss_devinfo *dp); -void snd_seq_oss_drain_write(struct seq_oss_devinfo *dp); /* */ void snd_seq_oss_process_queue(struct seq_oss_devinfo *dp, abstime_t time); |