summaryrefslogtreecommitdiffstats
path: root/sound/pci/rme32.c
diff options
context:
space:
mode:
Diffstat (limited to 'sound/pci/rme32.c')
-rw-r--r--sound/pci/rme32.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/sound/pci/rme32.c b/sound/pci/rme32.c
index 6c60dcd2e5a1..23d7f5d30c41 100644
--- a/sound/pci/rme32.c
+++ b/sound/pci/rme32.c
@@ -75,6 +75,7 @@
75#include <linux/interrupt.h> 75#include <linux/interrupt.h>
76#include <linux/pci.h> 76#include <linux/pci.h>
77#include <linux/module.h> 77#include <linux/module.h>
78#include <linux/io.h>
78 79
79#include <sound/core.h> 80#include <sound/core.h>
80#include <sound/info.h> 81#include <sound/info.h>
@@ -85,8 +86,6 @@
85#include <sound/asoundef.h> 86#include <sound/asoundef.h>
86#include <sound/initval.h> 87#include <sound/initval.h>
87 88
88#include <asm/io.h>
89
90static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX; /* Index 0-MAX */ 89static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX; /* Index 0-MAX */
91static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR; /* ID for this card */ 90static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR; /* ID for this card */
92static bool enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP; /* Enable this card */ 91static bool enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP; /* Enable this card */
@@ -632,7 +631,7 @@ snd_rme32_setframelog(struct rme32 * rme32, int n_channels, int is_playback)
632 } 631 }
633} 632}
634 633
635static int snd_rme32_setformat(struct rme32 * rme32, int format) 634static int snd_rme32_setformat(struct rme32 *rme32, snd_pcm_format_t format)
636{ 635{
637 switch (format) { 636 switch (format) {
638 case SNDRV_PCM_FORMAT_S16_LE: 637 case SNDRV_PCM_FORMAT_S16_LE: