diff options
author | Takashi Iwai <tiwai@suse.de> | 2010-01-12 09:40:48 +0100 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2010-01-12 09:40:48 +0100 |
commit | dba9532388b00d591d87c638a47dcc7ba3763fc5 (patch) | |
tree | cc9de8cbc40d0e927b1924d1d943208e84e21d1f /sound/oss/sound_config.h | |
parent | ALSA: usb-audio - Avoid Oops after disconnect (diff) | |
parent | ALSA: ac97: add AC97 STMicroelectronics' codecs (diff) | |
download | linux-dba9532388b00d591d87c638a47dcc7ba3763fc5.tar.xz linux-dba9532388b00d591d87c638a47dcc7ba3763fc5.zip |
Merge remote branch 'alsa/fixes' into fix/misc
Diffstat (limited to 'sound/oss/sound_config.h')
-rw-r--r-- | sound/oss/sound_config.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/oss/sound_config.h b/sound/oss/sound_config.h index 55271fbe7f49..9d35c4c65b9b 100644 --- a/sound/oss/sound_config.h +++ b/sound/oss/sound_config.h @@ -142,4 +142,6 @@ static inline int translate_mode(struct file *file) #define TIMER_ARMED 121234 #define TIMER_NOT_ARMED 1 +#define MAX_MEM_BLOCKS 1024 + #endif |