Merge branch 'fix/misc' into topic/misc

This commit is contained in:
Takashi Iwai 2010-10-11 13:45:22 +02:00
commit 4e83998f5a
594 changed files with 5027 additions and 3162 deletions

View file

@ -900,7 +900,7 @@ static int proc_init(struct snd_akm4xxx *ak)
return 0;
}
#else /* !CONFIG_PROC_FS */
static int proc_init(struct snd_akm4xxx *ak) {}
static int proc_init(struct snd_akm4xxx *ak) { return 0; }
#endif
int snd_akm4xxx_build_controls(struct snd_akm4xxx *ak)