diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-08-30 10:47:01 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-08-30 10:47:01 -0400 |
| commit | 444bd6fc18e4788f701a119cdfefe4f02444d9cb (patch) | |
| tree | 605ad11a825acf4bae9d98973becb3977ac2bae5 /sound/core/memory.c | |
| parent | 3cb904caa97f5c193df21b8cdf780a826564baff (diff) | |
| parent | c88469704d63787e8d44ca5ea1c1bd0adc29572d (diff) | |
Merge HEAD from master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa
Diffstat (limited to 'sound/core/memory.c')
| -rw-r--r-- | sound/core/memory.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/core/memory.c b/sound/core/memory.c index f6895577bf86..1622893d00a2 100644 --- a/sound/core/memory.c +++ b/sound/core/memory.c | |||
| @@ -56,7 +56,7 @@ static DEFINE_SPINLOCK(snd_alloc_vmalloc_lock); | |||
| 56 | #define VMALLOC_MAGIC 0x87654320 | 56 | #define VMALLOC_MAGIC 0x87654320 |
| 57 | static snd_info_entry_t *snd_memory_info_entry; | 57 | static snd_info_entry_t *snd_memory_info_entry; |
| 58 | 58 | ||
| 59 | void snd_memory_init(void) | 59 | void __init snd_memory_init(void) |
| 60 | { | 60 | { |
| 61 | snd_alloc_kmalloc = 0; | 61 | snd_alloc_kmalloc = 0; |
| 62 | snd_alloc_vmalloc = 0; | 62 | snd_alloc_vmalloc = 0; |