diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-10-11 13:45:22 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-10-11 13:45:22 +0200 |
| commit | 4e83998f5af010a928495988c586ea2926624db9 (patch) | |
| tree | e72d346172a30bbee165d7f585784724906da416 /sound/i2c/other | |
| parent | ALSA: oxygen - Add a SSID for CMI8787-HG2PCI (diff) | |
| parent | OSS: soundcard: locking bug in sound_ioctl() (diff) | |
| download | linux-4e83998f5af010a928495988c586ea2926624db9.tar.xz linux-4e83998f5af010a928495988c586ea2926624db9.zip | |
Merge branch 'fix/misc' into topic/misc
Diffstat (limited to 'sound/i2c/other')
| -rw-r--r-- | sound/i2c/other/ak4xxx-adda.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/i2c/other/ak4xxx-adda.c b/sound/i2c/other/ak4xxx-adda.c index ebab6c7aaa81..57ccba88700d 100644 --- a/sound/i2c/other/ak4xxx-adda.c +++ b/sound/i2c/other/ak4xxx-adda.c @@ -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) |