[ALSA] opti9x - Fix compile without CONFIG_PNP
authorTakashi Iwai <tiwai@suse.de>
Mon, 27 Feb 2006 16:23:46 +0000 (17:23 +0100)
committerJaroslav Kysela <perex@suse.cz>
Wed, 22 Mar 2006 09:31:40 +0000 (10:31 +0100)
Modules: Opti9xx drivers

Fix compile errors without CONFIG_PNP.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
sound/isa/opti9xx/opti92x-ad1848.c

index 63d96be..65b28cb 100644 (file)
@@ -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)