diff options
| author | Takashi Iwai <tiwai@suse.de> | 2006-03-25 19:49:42 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-04-07 09:44:28 -0700 |
| commit | a78639c736815c6a210abc6a992b8a14f9144c04 (patch) | |
| tree | 464a419636a88f19456372ad8c593514c370608c /sound | |
| parent | 33ac640f711b869c7e57505fa7c01310d10477ab (diff) | |
| download | linux-stable-a78639c736815c6a210abc6a992b8a14f9144c04.tar.gz linux-stable-a78639c736815c6a210abc6a992b8a14f9144c04.tar.bz2 linux-stable-a78639c736815c6a210abc6a992b8a14f9144c04.zip | |
[PATCH] opti9x - Fix compile without CONFIG_PNP
Modules: Opti9xx drivers
Fix compile errors without CONFIG_PNP.
This patch was already included in Linus' tree.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/isa/opti9xx/opti92x-ad1848.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/sound/isa/opti9xx/opti92x-ad1848.c b/sound/isa/opti9xx/opti92x-ad1848.c index 63d96be11b2b..65b28cbc0ebd 100644 --- a/sound/isa/opti9xx/opti92x-ad1848.c +++ b/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) |