aboutsummaryrefslogtreecommitdiffstats
path: root/include/sound
diff options
context:
space:
mode:
authorJie Yang <yang.jie@intel.com>2015-05-27 07:45:45 -0400
committerTakashi Iwai <tiwai@suse.de>2015-05-27 15:25:19 -0400
commitcd6a65036f0eac4ad83dc371bb458e9e6ba6e306 (patch)
tree8fde8da6fa86c62608202b5772059426e16ad217 /include/sound
parente0ecb05a965d0ff77ec65499bbc74eacd8d93452 (diff)
ALSA: replace CONFIG_PROC_FS with CONFIG_SND_PROC_FS
We may disable proc fs only for sound part, to reduce ALSA memory footprint. So add CONFIG_SND_PROC_FS and replace the old CONFIG_PROC_FSs in alsa code. With sound proc fs disabled, we can save about 9KB memory size on X86_64 platform. Signed-off-by: Jie Yang <yang.jie@intel.com> Reviewed-by: Mark Brown <broonie@kernel.org> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'include/sound')
-rw-r--r--include/sound/info.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/include/sound/info.h b/include/sound/info.h
index 16269951bafc..67390ee846aa 100644
--- a/include/sound/info.h
+++ b/include/sound/info.h
@@ -92,14 +92,14 @@ struct snd_info_entry {
92 struct list_head list; 92 struct list_head list;
93}; 93};
94 94
95#if defined(CONFIG_SND_OSSEMUL) && defined(CONFIG_PROC_FS) 95#if defined(CONFIG_SND_OSSEMUL) && defined(CONFIG_SND_PROC_FS)
96int snd_info_minor_register(void); 96int snd_info_minor_register(void);
97#else 97#else
98#define snd_info_minor_register() 0 98#define snd_info_minor_register() 0
99#endif 99#endif
100 100
101 101
102#ifdef CONFIG_PROC_FS 102#ifdef CONFIG_SND_PROC_FS
103 103
104extern struct snd_info_entry *snd_seq_root; 104extern struct snd_info_entry *snd_seq_root;
105#ifdef CONFIG_SND_OSSEMUL 105#ifdef CONFIG_SND_OSSEMUL
@@ -197,7 +197,7 @@ static inline int snd_info_check_reserved_words(const char *str) { return 1; }
197 * OSS info part 197 * OSS info part
198 */ 198 */
199 199
200#if defined(CONFIG_SND_OSSEMUL) && defined(CONFIG_PROC_FS) 200#if defined(CONFIG_SND_OSSEMUL) && defined(CONFIG_SND_PROC_FS)
201 201
202#define SNDRV_OSS_INFO_DEV_AUDIO 0 202#define SNDRV_OSS_INFO_DEV_AUDIO 0
203#define SNDRV_OSS_INFO_DEV_SYNTH 1 203#define SNDRV_OSS_INFO_DEV_SYNTH 1
@@ -210,6 +210,6 @@ static inline int snd_info_check_reserved_words(const char *str) { return 1; }
210int snd_oss_info_register(int dev, int num, char *string); 210int snd_oss_info_register(int dev, int num, char *string);
211#define snd_oss_info_unregister(dev, num) snd_oss_info_register(dev, num, NULL) 211#define snd_oss_info_unregister(dev, num) snd_oss_info_register(dev, num, NULL)
212 212
213#endif /* CONFIG_SND_OSSEMUL && CONFIG_PROC_FS */ 213#endif /* CONFIG_SND_OSSEMUL && CONFIG_SND_PROC_FS */
214 214
215#endif /* __SOUND_INFO_H */ 215#endif /* __SOUND_INFO_H */