Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs

[~andy/linux] / sound / pci / ctxfi / ctatc.h

diff --git a/sound/pci/ctxfi/ctatc.h b/sound/pci/ctxfi/ctatc.h
index 6bad27e06f4d42ec4745aea0fc322664699f1301..3a0def656af05c6b7870ceb375c2fffa299d7248 100644 (file)
--- a/sound/pci/ctxfi/ctatc.h
+++ b/sound/pci/ctxfi/ctatc.h
@@ -25,6 +25,7 @@
 #include <sound/core.h>
 
 #include "ctvmem.h"
+#include "cthardware.h"
 #include "ctresource.h"
 
 enum CTALSADEVS {              /* Types of alsa devices */
@@ -121,12 +122,9 @@ struct ct_atc {
        int (*spdif_out_get_status)(struct ct_atc *atc, unsigned int *status);
        int (*spdif_out_set_status)(struct ct_atc *atc, unsigned int status);
        int (*spdif_out_passthru)(struct ct_atc *atc, unsigned char state);
-       int (*have_digit_io_switch)(struct ct_atc *atc);
-       int (*have_dedicated_mic)(struct ct_atc *atc);
-       int (*have_output_switch)(struct ct_atc *atc);
+       struct capabilities (*capabilities)(struct ct_atc *atc);
        int (*output_switch_get)(struct ct_atc *atc);
        int (*output_switch_put)(struct ct_atc *atc, int position);
-       int (*have_mic_source_switch)(struct ct_atc *atc);
        int (*mic_source_switch_get)(struct ct_atc *atc);
        int (*mic_source_switch_put)(struct ct_atc *atc, int position);