Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / staging / intel_sst / intel_sst.h

diff --git a/drivers/staging/intel_sst/intel_sst.h b/drivers/staging/intel_sst/intel_sst.h
index 1f19f0d1d316e81d156b6e24f1f200885ab75ee6..cb03ff7d1a21451921884fdacf7b589c35beaf21 100644 (file)
--- a/drivers/staging/intel_sst/intel_sst.h
+++ b/drivers/staging/intel_sst/intel_sst.h
@@ -29,6 +29,7 @@
  *     and middleware.
  *  This file is shared between the SST and MAD drivers
  */
+#include "intel_sst_ioctl.h"
 
 #define SST_CARD_NAMES "intel_mid_card"
 
@@ -107,10 +108,15 @@ struct snd_pmic_ops {
        int (*power_down_pmic) (void);
 };
 
+struct intel_sst_pcm_control {
+       int (*open) (struct snd_sst_params *str_param);
+       int (*device_control) (int cmd, void *arg);
+       int (*close) (unsigned int str_id);
+};
 struct intel_sst_card_ops {
        char *module_name;
        unsigned int  vendor_id;
-       int (*control_set) (int control_element, void *value);
+       struct intel_sst_pcm_control *pcm_control;
        struct snd_pmic_ops *scard_ops;
 };