diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-01-19 09:53:43 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-01-19 09:53:43 -0500 |
| commit | 9e4c84967ef027fe50a03cf48dd6da9519c8e60c (patch) | |
| tree | 21d6b8168670f22521f3bb703e3b9d1932566c1c /sound/oss/sound_config.h | |
| parent | d2f2fcd2541bae004db7f4798ffd9d2cb75ae817 (diff) | |
| parent | 3fb4a508b8e7957aa899f32cd6d9d462e102c7ca (diff) | |
Merge branch 'fix/hda' into topic/hda
Conflicts:
sound/pci/hda/patch_realtek.c
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) | |||
| 142 | #define TIMER_ARMED 121234 | 142 | #define TIMER_ARMED 121234 |
| 143 | #define TIMER_NOT_ARMED 1 | 143 | #define TIMER_NOT_ARMED 1 |
| 144 | 144 | ||
| 145 | #define MAX_MEM_BLOCKS 1024 | ||
| 146 | |||
| 145 | #endif | 147 | #endif |