diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-04-05 12:39:11 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-04-05 12:39:11 -0400 |
| commit | b66696e3c0d8fc01efdbc701eba1276618332cb3 (patch) | |
| tree | 3094ef42787b8e0c900bce1f2391ced081ed1ba4 /sound/isa/es18xx.c | |
| parent | 9e74e7c81a24aee66024fc477786bd1de84e293b (diff) | |
| parent | a32f3926632e71c8aa23ce32fe2625f8d5f792c2 (diff) | |
Merge branch 'slabh' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc
* 'slabh' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc:
eeepc-wmi: include slab.h
staging/otus: include slab.h from usbdrv.h
percpu: don't implicitly include slab.h from percpu.h
kmemcheck: Fix build errors due to missing slab.h
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
iwlwifi: don't include iwl-dev.h from iwl-devtrace.h
x86: don't include slab.h from arch/x86/include/asm/pgtable_32.h
Fix up trivial conflicts in include/linux/percpu.h due to
is_kernel_percpu_address() having been introduced since the slab.h
cleanup with the percpu_up.c splitup.
Diffstat (limited to 'sound/isa/es18xx.c')
| -rw-r--r-- | sound/isa/es18xx.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sound/isa/es18xx.c b/sound/isa/es18xx.c index 9a43baae7250..fb4d6b34bbca 100644 --- a/sound/isa/es18xx.c +++ b/sound/isa/es18xx.c | |||
| @@ -80,7 +80,6 @@ | |||
| 80 | #include <linux/init.h> | 80 | #include <linux/init.h> |
| 81 | #include <linux/err.h> | 81 | #include <linux/err.h> |
| 82 | #include <linux/isa.h> | 82 | #include <linux/isa.h> |
| 83 | #include <linux/slab.h> | ||
| 84 | #include <linux/pnp.h> | 83 | #include <linux/pnp.h> |
| 85 | #include <linux/isapnp.h> | 84 | #include <linux/isapnp.h> |
| 86 | #include <linux/moduleparam.h> | 85 | #include <linux/moduleparam.h> |