diff options
author | Olaf Hering <olh@suse.de> | 2005-07-27 14:45:17 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-27 19:26:08 -0400 |
commit | 44456d37b59d8e541936ed26d8b6e08d27e88ac1 (patch) | |
tree | 11ca6fa29b8cfb56ecef2d1f4f9dc2d9d71d2a2f /sound | |
parent | 02b775696fee75a04041d8d94db26a9462216d24 (diff) |
[PATCH] turn many #if $undefined_string into #ifdef $undefined_string
turn many #if $undefined_string into #ifdef $undefined_string to fix some
warnings after -Wno-def was added to global CFLAGS
Signed-off-by: Olaf Hering <olh@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'sound')
-rw-r--r-- | sound/isa/sb/sb_mixer.c | 4 | ||||
-rw-r--r-- | sound/oss/pss.c | 2 | ||||
-rw-r--r-- | sound/pci/rme9652/rme9652.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/sound/isa/sb/sb_mixer.c b/sound/isa/sb/sb_mixer.c index cc5a2c6dec16..ff4b59968027 100644 --- a/sound/isa/sb/sb_mixer.c +++ b/sound/isa/sb/sb_mixer.c | |||
@@ -688,7 +688,7 @@ static struct sbmix_elem snd_als4000_ctl_3d_poweroff_switch = | |||
688 | SB_SINGLE("3D PowerOff Switch", SB_ALS4000_3D_TIME_DELAY, 4, 0x01); | 688 | SB_SINGLE("3D PowerOff Switch", SB_ALS4000_3D_TIME_DELAY, 4, 0x01); |
689 | static struct sbmix_elem snd_als4000_ctl_3d_delay = | 689 | static struct sbmix_elem snd_als4000_ctl_3d_delay = |
690 | SB_SINGLE("3D Delay", SB_ALS4000_3D_TIME_DELAY, 0, 0x0f); | 690 | SB_SINGLE("3D Delay", SB_ALS4000_3D_TIME_DELAY, 0, 0x0f); |
691 | #if NOT_AVAILABLE | 691 | #ifdef NOT_AVAILABLE |
692 | static struct sbmix_elem snd_als4000_ctl_fmdac = | 692 | static struct sbmix_elem snd_als4000_ctl_fmdac = |
693 | SB_SINGLE("FMDAC Switch (Option ?)", SB_ALS4000_FMDAC, 0, 0x01); | 693 | SB_SINGLE("FMDAC Switch (Option ?)", SB_ALS4000_FMDAC, 0, 0x01); |
694 | static struct sbmix_elem snd_als4000_ctl_qsound = | 694 | static struct sbmix_elem snd_als4000_ctl_qsound = |
@@ -723,7 +723,7 @@ static struct sbmix_elem *snd_als4000_controls[] = { | |||
723 | &snd_als4000_ctl_3d_output_ratio, | 723 | &snd_als4000_ctl_3d_output_ratio, |
724 | &snd_als4000_ctl_3d_delay, | 724 | &snd_als4000_ctl_3d_delay, |
725 | &snd_als4000_ctl_3d_poweroff_switch, | 725 | &snd_als4000_ctl_3d_poweroff_switch, |
726 | #if NOT_AVAILABLE | 726 | #ifdef NOT_AVAILABLE |
727 | &snd_als4000_ctl_fmdac, | 727 | &snd_als4000_ctl_fmdac, |
728 | &snd_als4000_ctl_qsound, | 728 | &snd_als4000_ctl_qsound, |
729 | #endif | 729 | #endif |
diff --git a/sound/oss/pss.c b/sound/oss/pss.c index 3ed38765dcc4..a617ccb40e00 100644 --- a/sound/oss/pss.c +++ b/sound/oss/pss.c | |||
@@ -714,7 +714,7 @@ static int __init attach_pss(struct address_info *hw_config) | |||
714 | 714 | ||
715 | disable_all_emulations(); | 715 | disable_all_emulations(); |
716 | 716 | ||
717 | #if YOU_REALLY_WANT_TO_ALLOCATE_THESE_RESOURCES | 717 | #ifdef YOU_REALLY_WANT_TO_ALLOCATE_THESE_RESOURCES |
718 | if (sound_alloc_dma(hw_config->dma, "PSS")) | 718 | if (sound_alloc_dma(hw_config->dma, "PSS")) |
719 | { | 719 | { |
720 | printk("pss.c: Can't allocate DMA channel.\n"); | 720 | printk("pss.c: Can't allocate DMA channel.\n"); |
diff --git a/sound/pci/rme9652/rme9652.c b/sound/pci/rme9652/rme9652.c index f3037402d58f..1bc9d0df8516 100644 --- a/sound/pci/rme9652/rme9652.c +++ b/sound/pci/rme9652/rme9652.c | |||
@@ -1470,7 +1470,7 @@ static int snd_rme9652_get_tc_valid(snd_kcontrol_t * kcontrol, snd_ctl_elem_valu | |||
1470 | return 0; | 1470 | return 0; |
1471 | } | 1471 | } |
1472 | 1472 | ||
1473 | #if ALSA_HAS_STANDARD_WAY_OF_RETURNING_TIMECODE | 1473 | #ifdef ALSA_HAS_STANDARD_WAY_OF_RETURNING_TIMECODE |
1474 | 1474 | ||
1475 | /* FIXME: this routine needs a port to the new control API --jk */ | 1475 | /* FIXME: this routine needs a port to the new control API --jk */ |
1476 | 1476 | ||