From 36cd6f6f20724d49aac1910e310f81a43e0cb657 Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Thu, 18 Apr 2013 18:43:58 +0200 Subject: audio: remove the need for audio card CONFIG_* symbols Signed-off-by: Paolo Bonzini Message-id: 1366303444-24620-3-git-send-email-pbonzini@redhat.com Signed-off-by: Anthony Liguori --- hw/audio/intel-hda.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'hw/audio/intel-hda.c') diff --git a/hw/audio/intel-hda.c b/hw/audio/intel-hda.c index 3d8077ac0d..1016af0204 100644 --- a/hw/audio/intel-hda.c +++ b/hw/audio/intel-hda.c @@ -1300,21 +1300,11 @@ static const TypeInfo hda_codec_device_type_info = { .class_init = hda_codec_device_class_init, }; -static void intel_hda_register_types(void) -{ - type_register_static(&hda_codec_bus_info); - type_register_static(&intel_hda_info_ich6); - type_register_static(&intel_hda_info_ich9); - type_register_static(&hda_codec_device_type_info); -} - -type_init(intel_hda_register_types) - /* * create intel hda controller with codec attached to it, * so '-soundhw hda' works. */ -int intel_hda_and_codec_init(PCIBus *bus) +static int intel_hda_and_codec_init(PCIBus *bus) { PCIDevice *controller; BusState *hdabus; @@ -1327,3 +1317,13 @@ int intel_hda_and_codec_init(PCIBus *bus) return 0; } +static void intel_hda_register_types(void) +{ + type_register_static(&hda_codec_bus_info); + type_register_static(&intel_hda_info_ich6); + type_register_static(&intel_hda_info_ich9); + type_register_static(&hda_codec_device_type_info); + pci_register_soundhw("hda", "Intel HD Audio", intel_hda_and_codec_init); +} + +type_init(intel_hda_register_types) -- cgit 1.4.1