diff options
author | Takashi Iwai <tiwai@suse.de> | 2006-01-04 09:06:44 -0500 |
---|---|---|
committer | Jaroslav Kysela <perex@suse.cz> | 2006-01-22 10:23:48 -0500 |
commit | 59b1b34f47e6c8ac8f00660db2cd34216819b400 (patch) | |
tree | 5422f5f889696e4896e5c44a26b9c021fe8a47fb /sound/isa/wavefront | |
parent | d82ed2ffc2839413c20b41a271a4d8db12b0683c (diff) |
[ALSA] Fix compilation without CONFIG_PNP
Fix compilation of some ISA drivers without CONFIG_PNP.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/isa/wavefront')
-rw-r--r-- | sound/isa/wavefront/wavefront.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/sound/isa/wavefront/wavefront.c b/sound/isa/wavefront/wavefront.c index a6dcb2f970ca..fa3ab960de17 100644 --- a/sound/isa/wavefront/wavefront.c +++ b/sound/isa/wavefront/wavefront.c | |||
@@ -84,10 +84,9 @@ module_param_array(use_cs4232_midi, bool, NULL, 0444); | |||
84 | MODULE_PARM_DESC(use_cs4232_midi, "Use CS4232 MPU-401 interface (inaccessibly located inside your computer)"); | 84 | MODULE_PARM_DESC(use_cs4232_midi, "Use CS4232 MPU-401 interface (inaccessibly located inside your computer)"); |
85 | 85 | ||
86 | static struct platform_device *platform_devices[SNDRV_CARDS]; | 86 | static struct platform_device *platform_devices[SNDRV_CARDS]; |
87 | static int pnp_registered; | ||
88 | |||
89 | 87 | ||
90 | #ifdef CONFIG_PNP | 88 | #ifdef CONFIG_PNP |
89 | static int pnp_registered; | ||
91 | 90 | ||
92 | static struct pnp_card_device_id snd_wavefront_pnpids[] = { | 91 | static struct pnp_card_device_id snd_wavefront_pnpids[] = { |
93 | /* Tropez */ | 92 | /* Tropez */ |
@@ -695,8 +694,10 @@ static void __init_or_module snd_wavefront_unregister_all(void) | |||
695 | { | 694 | { |
696 | int i; | 695 | int i; |
697 | 696 | ||
697 | #ifdef CONFIG_PNP | ||
698 | if (pnp_registered) | 698 | if (pnp_registered) |
699 | pnp_unregister_card_driver(&wavefront_pnpc_driver); | 699 | pnp_unregister_card_driver(&wavefront_pnpc_driver); |
700 | #endif | ||
700 | for (i = 0; i < ARRAY_SIZE(platform_devices); ++i) | 701 | for (i = 0; i < ARRAY_SIZE(platform_devices); ++i) |
701 | platform_device_unregister(platform_devices[i]); | 702 | platform_device_unregister(platform_devices[i]); |
702 | platform_driver_unregister(&snd_wavefront_driver); | 703 | platform_driver_unregister(&snd_wavefront_driver); |
@@ -725,11 +726,13 @@ static int __init alsa_card_wavefront_init(void) | |||
725 | cards++; | 726 | cards++; |
726 | } | 727 | } |
727 | 728 | ||
729 | #ifdef CONFIG_PNP | ||
728 | i = pnp_register_card_driver(&wavefront_pnpc_driver); | 730 | i = pnp_register_card_driver(&wavefront_pnpc_driver); |
729 | if (i >= 0) { | 731 | if (i >= 0) { |
730 | pnp_registered = 1; | 732 | pnp_registered = 1; |
731 | cards += i; | 733 | cards += i; |
732 | } | 734 | } |
735 | #endif | ||
733 | 736 | ||
734 | if (!cards) { | 737 | if (!cards) { |
735 | #ifdef MODULE | 738 | #ifdef MODULE |