Merge branch 'x86-build-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-microblaze.git] / include / sound / hda_component.h

diff --git a/include/sound/hda_component.h b/include/sound/hda_component.h
index 2ec31b3..d4804c7 100644 (file)
--- a/include/sound/hda_component.h
+++ b/include/sound/hda_component.h
@@ -20,7 +20,7 @@ int snd_hdac_acomp_get_eld(struct hdac_device *codec, hda_nid_t nid, int dev_id,
                           bool *audio_enabled, char *buffer, int max_bytes);
 int snd_hdac_acomp_init(struct hdac_bus *bus,
                        const struct drm_audio_component_audio_ops *aops,
-                       int (*match_master)(struct device *, void *),
+                       int (*match_master)(struct device *, int, void *),
                        size_t extra_size);
 int snd_hdac_acomp_exit(struct hdac_bus *bus);
 int snd_hdac_acomp_register_notifier(struct hdac_bus *bus,
@@ -47,7 +47,8 @@ static inline int snd_hdac_acomp_get_eld(struct hdac_device *codec, hda_nid_t ni
 }
 static inline int snd_hdac_acomp_init(struct hdac_bus *bus,
                                      const struct drm_audio_component_audio_ops *aops,
-                                     int (*match_master)(struct device *, void *),
+                                     int (*match_master)(struct device *,
+                                                         int, void *),
                                      size_t extra_size)
 {
        return -ENODEV;