diff options
Diffstat (limited to 'sound/aoa/aoa.h')
| -rw-r--r-- | sound/aoa/aoa.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sound/aoa/aoa.h b/sound/aoa/aoa.h index 378ef1e9879..34c668f2779 100644 --- 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> @@ -99,7 +97,7 @@ struct aoa_fabric { * that are not assigned yet are passed to the fabric * again for reconsideration. */ extern int -aoa_fabric_register(struct aoa_fabric *fabric); +aoa_fabric_register(struct aoa_fabric *fabric, struct device *dev); /* it is vital to call this when the fabric exits! * When calling, the remove_codec will be called @@ -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); |