Merge tag 'mmc-v3.20-1' of git://git.linaro.org/people/ulf.hansson/mmc

[karo-tx-linux.git] / include / sound / es1688.h

diff --git a/include/sound/es1688.h b/include/sound/es1688.h
index f752dd33dfaf81ff43da9473b7ce2f30d67f198d..b34f23a5bb74a35f8be07b462af23b18eb80544a 100644 (file)
--- a/include/sound/es1688.h
+++ b/include/sound/es1688.h
@@ -22,8 +22,8 @@
  *
  */
 
-#include "control.h"
-#include "pcm.h"
+#include <sound/control.h>
+#include <sound/pcm.h>
 #include <linux/interrupt.h>
 
 #define ES1688_HW_AUTO         0x0000
@@ -115,8 +115,7 @@ int snd_es1688_create(struct snd_card *card,
                      int mpu_irq,
                      int dma8,
                      unsigned short hardware);
-int snd_es1688_pcm(struct snd_card *card, struct snd_es1688 *chip, int device,
-                  struct snd_pcm **rpcm);
+int snd_es1688_pcm(struct snd_card *card, struct snd_es1688 *chip, int device);
 int snd_es1688_mixer(struct snd_card *card, struct snd_es1688 *chip);
 int snd_es1688_reset(struct snd_es1688 *chip);