From 2246d891abd88aefb4f28293197831c0511bcebb Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Mon, 27 Feb 2006 17:23:46 +0100 Subject: [PATCH] --- yaml --- r: 22741 b: refs/heads/master c: 0bbbc4ca7e2459f2750bd4bd8dda2ccbf7a71f02 h: refs/heads/master i: 22739: fdfae0c5575f1b273ca473d9b1bc877fa486b583 v: v3 --- [refs] | 2 +- trunk/sound/isa/opti9xx/opti92x-ad1848.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 06dba0356c50..91e55968dcd8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a5a6bbd9b2481dd556236ea866424590f5f987a4 +refs/heads/master: 0bbbc4ca7e2459f2750bd4bd8dda2ccbf7a71f02 diff --git a/trunk/sound/isa/opti9xx/opti92x-ad1848.c b/trunk/sound/isa/opti9xx/opti92x-ad1848.c index 63d96be11b2b..65b28cbc0ebd 100644 --- a/trunk/sound/isa/opti9xx/opti92x-ad1848.c +++ b/trunk/sound/isa/opti9xx/opti92x-ad1848.c @@ -2088,9 +2088,11 @@ static int __init alsa_card_opti9xx_init(void) int error; struct platform_device *device; +#ifdef CONFIG_PNP pnp_register_card_driver(&opti9xx_pnpc_driver); if (snd_opti9xx_pnp_is_probed) return 0; +#endif if (! is_isapnp_selected()) { error = platform_driver_register(&snd_opti9xx_driver); if (error < 0) @@ -2102,7 +2104,9 @@ static int __init alsa_card_opti9xx_init(void) } platform_driver_unregister(&snd_opti9xx_driver); } +#ifdef CONFIG_PNP pnp_unregister_card_driver(&opti9xx_pnpc_driver); +#endif #ifdef MODULE printk(KERN_ERR "no OPTi " CHIP_NAME " soundcard found\n"); #endif @@ -2115,7 +2119,9 @@ static void __exit alsa_card_opti9xx_exit(void) platform_device_unregister(snd_opti9xx_platform_device); platform_driver_unregister(&snd_opti9xx_driver); } +#ifdef CONFIG_PNP pnp_unregister_card_driver(&opti9xx_pnpc_driver); +#endif } module_init(alsa_card_opti9xx_init)