diff options
author | Takashi Iwai <tiwai@suse.de> | 2006-02-27 11:23:46 -0500 |
---|---|---|
committer | Jaroslav Kysela <perex@suse.cz> | 2006-03-22 04:31:40 -0500 |
commit | 0bbbc4ca7e2459f2750bd4bd8dda2ccbf7a71f02 (patch) | |
tree | 110852fee061c6143b98105ff6aff2a8fc01eb08 /sound/isa | |
parent | a5a6bbd9b2481dd556236ea866424590f5f987a4 (diff) |
[ALSA] opti9x - Fix compile without CONFIG_PNP
Modules: Opti9xx drivers
Fix compile errors without CONFIG_PNP.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/isa')
-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) | |||
2088 | int error; | 2088 | int error; |
2089 | struct platform_device *device; | 2089 | struct platform_device *device; |
2090 | 2090 | ||
2091 | #ifdef CONFIG_PNP | ||
2091 | pnp_register_card_driver(&opti9xx_pnpc_driver); | 2092 | pnp_register_card_driver(&opti9xx_pnpc_driver); |
2092 | if (snd_opti9xx_pnp_is_probed) | 2093 | if (snd_opti9xx_pnp_is_probed) |
2093 | return 0; | 2094 | return 0; |
2095 | #endif | ||
2094 | if (! is_isapnp_selected()) { | 2096 | if (! is_isapnp_selected()) { |
2095 | error = platform_driver_register(&snd_opti9xx_driver); | 2097 | error = platform_driver_register(&snd_opti9xx_driver); |
2096 | if (error < 0) | 2098 | if (error < 0) |
@@ -2102,7 +2104,9 @@ static int __init alsa_card_opti9xx_init(void) | |||
2102 | } | 2104 | } |
2103 | platform_driver_unregister(&snd_opti9xx_driver); | 2105 | platform_driver_unregister(&snd_opti9xx_driver); |
2104 | } | 2106 | } |
2107 | #ifdef CONFIG_PNP | ||
2105 | pnp_unregister_card_driver(&opti9xx_pnpc_driver); | 2108 | pnp_unregister_card_driver(&opti9xx_pnpc_driver); |
2109 | #endif | ||
2106 | #ifdef MODULE | 2110 | #ifdef MODULE |
2107 | printk(KERN_ERR "no OPTi " CHIP_NAME " soundcard found\n"); | 2111 | printk(KERN_ERR "no OPTi " CHIP_NAME " soundcard found\n"); |
2108 | #endif | 2112 | #endif |
@@ -2115,7 +2119,9 @@ static void __exit alsa_card_opti9xx_exit(void) | |||
2115 | platform_device_unregister(snd_opti9xx_platform_device); | 2119 | platform_device_unregister(snd_opti9xx_platform_device); |
2116 | platform_driver_unregister(&snd_opti9xx_driver); | 2120 | platform_driver_unregister(&snd_opti9xx_driver); |
2117 | } | 2121 | } |
2122 | #ifdef CONFIG_PNP | ||
2118 | pnp_unregister_card_driver(&opti9xx_pnpc_driver); | 2123 | pnp_unregister_card_driver(&opti9xx_pnpc_driver); |
2124 | #endif | ||
2119 | } | 2125 | } |
2120 | 2126 | ||
2121 | module_init(alsa_card_opti9xx_init) | 2127 | module_init(alsa_card_opti9xx_init) |