Merge tag 'upstream-3.15-rc1' of git://git.infradead.org/linux-ubifs

[deliverable/linux.git] / sound / aoa / aoa.h

diff --git a/sound/aoa/aoa.h b/sound/aoa/aoa.h
index 541b908f3cdf0075feebeb1b00672817adb2dc20..34c668f2779882f10b278a5e92654511eec90ec6 100644 (file)
--- a/sound/aoa/aoa.h
+++ b/sound/aoa/aoa.h
@@ -10,8 +10,6 @@
 #define __AOA_H
 #include <asm/prom.h>
 #include <linux/module.h>
-/* So apparently there's a reason for requiring driver.h to be included first! */
-#include <sound/driver.h>
 #include <sound/core.h>
 #include <sound/asound.h>
 #include <sound/control.h>
@@ -118,7 +116,7 @@ struct aoa_card {
        struct snd_card *alsa_card;
 };
         
-extern int aoa_snd_device_new(snd_device_type_t type,
+extern int aoa_snd_device_new(enum snd_device_type type,
        void * device_data, struct snd_device_ops * ops);
 extern struct snd_card *aoa_get_card(void);
 extern int aoa_snd_ctl_add(struct snd_kcontrol* control);