diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-01-13 08:58:37 (GMT) |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-01-13 09:08:50 (GMT) |
| commit | 61405fea92c42d072d9b8bd189689f1502a838af (patch) | |
| tree | 013ea3e7ed71f4114004d5852d40b6e89e128f76 /sound/oss/sound_config.h | |
| parent | 9c443dfdd31eddea6cbe6ee0ca469fbcc4e1dc3b (diff) | |
| parent | 1703f2c321a8a531c393e137a82602e16c6061cb (diff) | |
| download | linux-fsl-qoriq-61405fea92c42d072d9b8bd189689f1502a838af.tar.xz | |
Merge branch 'perf/urgent' into perf/core
Merge reason: queue up dependent patch, update to -rc4
Signed-off-by: Ingo Molnar <mingo@elte.hu>
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 55271fb..9d35c4c 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 |