diff options
| author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
|---|---|---|
| committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
| commit | ada47b5fe13d89735805b566185f4885f5a3f750 (patch) | |
| tree | 644b88f8a71896307d71438e9b3af49126ffb22b /sound/oss/sound_config.h | |
| parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
| parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) | |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
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 |