Merge tag 'vfio-v4.5-rc1' of git://github.com/awilliam/linux-vfio

[karo-tx-linux.git] / sound / pci / fm801.c

diff --git a/sound/pci/fm801.c b/sound/pci/fm801.c
index 1fdd92b6f18f377585b2c36813fcb9ff444fc691..759295aa836684f4cff19abe571992d22e1c4f60 100644 (file)
--- a/sound/pci/fm801.c
+++ b/sound/pci/fm801.c
@@ -30,7 +30,7 @@
 #include <sound/initval.h>
 
 #ifdef CONFIG_SND_FM801_TEA575X_BOOL
-#include <media/tea575x.h>
+#include <media/drv-intf/tea575x.h>
 #endif
 
 MODULE_AUTHOR("Jaroslav Kysela <perex@perex.cz>");
@@ -815,7 +815,7 @@ static void snd_fm801_tea575x_set_direction(struct snd_tea575x *tea, bool output
        fm801_writew(chip, GPIO_CTRL, reg);
 }
 
-static struct snd_tea575x_ops snd_fm801_tea_ops = {
+static const struct snd_tea575x_ops snd_fm801_tea_ops = {
        .set_pins = snd_fm801_tea575x_set_pins,
        .get_pins = snd_fm801_tea575x_get_pins,
        .set_direction = snd_fm801_tea575x_set_direction,