diff options
author | Mark Brown | 2011-11-08 10:47:46 +0000 |
---|---|---|
committer | Mark Brown | 2011-11-08 10:47:46 +0000 |
commit | 41966710ab574f1fcedf3e10e1ceef911c096d1d (patch) | |
tree | a370f9fb2392267d1e7b06d7c9f43c6d80eb12be /sound/synth/util_mem.c | |
parent | 4633fa48fb41dc6d6f0cd83d7f6b7e262820e7cb (diff) | |
parent | 1dd6c0770d7d4ca477a1a8452ab0161b1150e4ad (diff) |
Merge branch 'for-3.2' into for-3.3
Diffstat (limited to 'sound/synth/util_mem.c')
-rw-r--r-- | sound/synth/util_mem.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/synth/util_mem.c b/sound/synth/util_mem.c index c85522e3808d..8e34bc4e07ec 100644 --- a/sound/synth/util_mem.c +++ b/sound/synth/util_mem.c @@ -21,6 +21,7 @@ #include <linux/mutex.h> #include <linux/init.h> #include <linux/slab.h> +#include <linux/module.h> #include <sound/core.h> #include <sound/util_mem.h> |