Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid

[linux-2.6-block.git] / sound / pci / ctxfi / ctamixer.h

diff --git a/sound/pci/ctxfi/ctamixer.h b/sound/pci/ctxfi/ctamixer.h
index 72f42f27434eb7f4dcada14fe737be047d03d7f0..2de18aa6508dbd4b9a363e2f760c2fdb4cd6bf63 100644 (file)
--- a/sound/pci/ctxfi/ctamixer.h
+++ b/sound/pci/ctxfi/ctamixer.h
@@ -58,7 +58,7 @@ struct amixer {
        unsigned char idx[8];
        struct rsc *input;      /* pointer to a resource acting as source */
        struct sum *sum;        /* Put amixer output to this summation node */
-       struct amixer_rsc_ops *ops;     /* AMixer specific operations */
+       const struct amixer_rsc_ops *ops;       /* AMixer specific operations */
 };
 
 struct amixer_rsc_ops {