Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable

[pandora-kernel.git] / include / linux / mISDNdsp.h

diff --git a/include/linux/mISDNdsp.h b/include/linux/mISDNdsp.h
index 6b71d2d..41d1eeb 100644 (file)
--- a/include/linux/mISDNdsp.h
+++ b/include/linux/mISDNdsp.h
@@ -12,7 +12,8 @@ struct mISDN_dsp_element {
        void    *(*new)(const char *arg);
        void    (*free)(void *p);
        void    (*process_tx)(void *p, unsigned char *data, int len);
-       void    (*process_rx)(void *p, unsigned char *data, int len);
+       void    (*process_rx)(void *p, unsigned char *data, int len,
+                       unsigned int txlen);
        int     num_args;
        struct mISDN_dsp_element_arg
                *args;
@@ -24,6 +25,7 @@ extern void mISDN_dsp_element_unregister(struct mISDN_dsp_element *elem);
 struct dsp_features {
        int     hfc_id; /* unique id to identify the chip (or -1) */
        int     hfc_dtmf; /* set if HFCmulti card supports dtmf */
+       int     hfc_conf; /* set if HFCmulti card supports conferences */
        int     hfc_loops; /* set if card supports tone loops */
        int     hfc_echocanhw; /* set if card supports echocancelation*/
        int     pcm_id; /* unique id to identify the pcm bus (or -1) */