Add the conventional include guards around the content of the hda_component.h header file. This prevents double-declaration of struct hda_component if the header gets included multiple times.

This isn't causing any problems with current code, so no need to backport to older kernels.

Signed-off-by: Richard Fitzgerald rf@opensource.cirrus.com --- sound/pci/hda/hda_component.h | 5 +++++ 1 file changed, 5 insertions(+)

diff --git a/sound/pci/hda/hda_component.h b/sound/pci/hda/hda_component.h index deae9dea01b4..a0fcc723483d 100644 --- a/sound/pci/hda/hda_component.h +++ b/sound/pci/hda/hda_component.h @@ -6,6 +6,9 @@ * Cirrus Logic International Semiconductor Ltd. */

+#ifndef __HDA_COMPONENT_H__ +#define __HDA_COMPONENT_H__ + #include <linux/acpi.h> #include <linux/component.h>

@@ -82,3 +85,5 @@ static inline void hda_component_manager_unbind(struct hda_codec *cdc, { component_unbind_all(hda_codec_dev(cdc), comps); } + +#endif /* ifndef __HDA_COMPONENT_H__ */