diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-04-15 03:35:24 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-04-15 03:36:16 -0400 |
| commit | b257c14ceb1194a6181144210056d38f22127189 (patch) | |
| tree | c803925f1d5bf2237e7495d306bf43929df0c952 /sound/isa/cmi8330.c | |
| parent | 371fd7e7a56a5c136d31aa980011bd2f131c3ef5 (diff) | |
| parent | 2ba3abd8186f24c7fb418927025b4e2120e3a362 (diff) | |
Merge branch 'linus' into sched/core
Merge reason: merge the latest fixes, update to -rc4.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'sound/isa/cmi8330.c')
| -rw-r--r-- | sound/isa/cmi8330.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sound/isa/cmi8330.c b/sound/isa/cmi8330.c index 8246aae32ab..fe79a169acb 100644 --- a/sound/isa/cmi8330.c +++ b/sound/isa/cmi8330.c | |||
| @@ -46,7 +46,6 @@ | |||
| 46 | #include <linux/init.h> | 46 | #include <linux/init.h> |
| 47 | #include <linux/err.h> | 47 | #include <linux/err.h> |
| 48 | #include <linux/isa.h> | 48 | #include <linux/isa.h> |
| 49 | #include <linux/slab.h> | ||
| 50 | #include <linux/pnp.h> | 49 | #include <linux/pnp.h> |
| 51 | #include <linux/moduleparam.h> | 50 | #include <linux/moduleparam.h> |
| 52 | #include <sound/core.h> | 51 | #include <sound/core.h> |