diff --git a/src/add-ons/kernel/drivers/audio/ac97/auvia/ac97.c b/src/add-ons/kernel/drivers/audio/ac97/auvia/ac97.c
index 2275bdedc8..e8b20c4c81 100644
--- a/src/add-ons/kernel/drivers/audio/ac97/auvia/ac97.c
+++ b/src/add-ons/kernel/drivers/audio/ac97/auvia/ac97.c
@@ -196,9 +196,9 @@ ac97_get_3d_stereo_enhancement(device_config *config)
 }
 
 const char *
-ac97_get_vendor_id_description()
+ac97_get_vendor_id_description(device_config *config)
 {
-	uint32 id = ac97_get_vendor_id();
+	uint32 id = ac97_get_vendor_id(config);
 	codec_table *codec = find_codec_table(id);
 	char f = (id >> 24) & 0xff;
 	char s = (id >> 16) & 0xff;
diff --git a/src/add-ons/kernel/drivers/audio/ac97/auvia/ac97.h b/src/add-ons/kernel/drivers/audio/ac97/auvia/ac97.h
index 59a08155a7..6726d8a0e0 100644
--- a/src/add-ons/kernel/drivers/audio/ac97/auvia/ac97.h
+++ b/src/add-ons/kernel/drivers/audio/ac97/auvia/ac97.h
@@ -68,10 +68,10 @@ enum AC97_REGISTER {
 	AC97_VENDOR_ID2			= 0x7E
 };
 
-const char *	ac97_get_3d_stereo_enhancement();
-const char *	ac97_get_vendor_id_description();
-uint32			ac97_get_vendor_id();
-void			ac97_init();
+const char *	ac97_get_3d_stereo_enhancement(device_config *config);
+const char *	ac97_get_vendor_id_description(device_config *config);
+uint32			ac97_get_vendor_id(device_config *config);
+void			ac97_init(device_config *config);
 
 void ac97_amp_enable(device_config *config, bool yesno);
 
diff --git a/src/add-ons/kernel/drivers/audio/ac97/auvia/auvia.c b/src/add-ons/kernel/drivers/audio/ac97/auvia/auvia.c
index 9bb50c51c2..3fb429f537 100644
--- a/src/add-ons/kernel/drivers/audio/ac97/auvia/auvia.c
+++ b/src/add-ons/kernel/drivers/audio/ac97/auvia/auvia.c
@@ -514,9 +514,9 @@ auvia_setup(auvia_dev * card)
 	ac97_init(&card->config);
 	ac97_amp_enable(&card->config, true);
 
-	PRINT(("codec vendor id      = %#08x\n",ac97_get_vendor_id()));
-	PRINT(("codec description     = %s\n",ac97_get_vendor_id_description()));
-	PRINT(("codec 3d enhancement = %s\n",ac97_get_3d_stereo_enhancement()));
+	PRINT(("codec vendor id      = %#08x\n",ac97_get_vendor_id(&card->config)));
+	PRINT(("codec description     = %s\n",ac97_get_vendor_id_description(&card->config)));
+	PRINT(("codec 3d enhancement = %s\n",ac97_get_3d_stereo_enhancement(&card->config)));
 	
 	PRINT(("installing interrupt : %x\n", card->config.irq));
 	install_io_interrupt_handler(card->config.irq, auvia_int, card, 0);
diff --git a/src/add-ons/kernel/drivers/audio/emuxki/ac97.c b/src/add-ons/kernel/drivers/audio/emuxki/ac97.c
index 88dfddb946..d00706d5d6 100644
--- a/src/add-ons/kernel/drivers/audio/emuxki/ac97.c
+++ b/src/add-ons/kernel/drivers/audio/emuxki/ac97.c
@@ -196,9 +196,9 @@ ac97_get_3d_stereo_enhancement(device_config *config)
 }
 
 const char *
-ac97_get_vendor_id_description()
+ac97_get_vendor_id_description(device_config *config)
 {
-	uint32 id = ac97_get_vendor_id();
+	uint32 id = ac97_get_vendor_id(config);
 	codec_table *codec = find_codec_table(id);
 	char f = (id >> 24) & 0xff;
 	char s = (id >> 16) & 0xff;
diff --git a/src/add-ons/kernel/drivers/audio/emuxki/ac97.h b/src/add-ons/kernel/drivers/audio/emuxki/ac97.h
index f286f95a87..223dfb7fa4 100644
--- a/src/add-ons/kernel/drivers/audio/emuxki/ac97.h
+++ b/src/add-ons/kernel/drivers/audio/emuxki/ac97.h
@@ -68,10 +68,10 @@ enum AC97_REGISTER {
 	AC97_VENDOR_ID2			= 0x7E
 };
 
-const char *	ac97_get_3d_stereo_enhancement();
-const char *	ac97_get_vendor_id_description();
-uint32			ac97_get_vendor_id();
-void			ac97_init();
+const char *	ac97_get_3d_stereo_enhancement(device_config *config);
+const char *	ac97_get_vendor_id_description(device_config *config);
+uint32			ac97_get_vendor_id(device_config *config);
+void			ac97_init(device_config *config);
 
 void ac97_amp_enable(device_config *config, bool yesno);
 
diff --git a/src/add-ons/kernel/drivers/audio/emuxki/emuxki.c b/src/add-ons/kernel/drivers/audio/emuxki/emuxki.c
index 1f0849ab92..be6685ba6e 100644
--- a/src/add-ons/kernel/drivers/audio/emuxki/emuxki.c
+++ b/src/add-ons/kernel/drivers/audio/emuxki/emuxki.c
@@ -2073,9 +2073,9 @@ emuxki_setup(emuxki_dev * card)
 	ac97_init(&card->config);
 	ac97_amp_enable(&card->config, true);
 
-	PRINT(("codec vendor id      = %#08x\n",ac97_get_vendor_id()));
-	PRINT(("codec description     = %s\n",ac97_get_vendor_id_description()));
-	PRINT(("codec 3d enhancement = %s\n",ac97_get_3d_stereo_enhancement()));
+	PRINT(("codec vendor id      = %#08x\n",ac97_get_vendor_id(&card->config)));
+	PRINT(("codec description     = %s\n",ac97_get_vendor_id_description(&card->config)));
+	PRINT(("codec 3d enhancement = %s\n",ac97_get_3d_stereo_enhancement(&card->config)));
 	
 	if(IS_AUDIGY2(&card->config)) {
 		emuxki_reg_write_32(&card->config, EMU_HCFG, EMU_HCFG_AUDIOENABLE |