diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-08-31 14:14:33 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-08-31 14:14:46 +1000 |
| commit | bc4c05687705979c74c4016f8ffb7c750df6ce88 (patch) | |
| tree | d09085f53a624bfa90fe2ea069f955e131263c74 /sound/isa/sb/emu8000.c | |
| parent | af2f332df9b9ffd7e8eeac7d4c1fad1afefcb0aa (diff) | |
| parent | 25215aa319f0bd032840e6f509d490e919e7234c (diff) | |
Merge remote-tracking branch 'moduleh/module.h-split'
Conflicts:
arch/arm/mach-bcmring/mm.c
drivers/scsi/libfc/fc_lport.c
include/linux/dmaengine.h
Diffstat (limited to 'sound/isa/sb/emu8000.c')
| -rw-r--r-- | sound/isa/sb/emu8000.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/isa/sb/emu8000.c b/sound/isa/sb/emu8000.c index 5d61f5a29130..71887874679c 100644 --- a/sound/isa/sb/emu8000.c +++ b/sound/isa/sb/emu8000.c @@ -24,6 +24,7 @@ #include <linux/sched.h> #include <linux/slab.h> #include <linux/ioport.h> +#include <linux/export.h> #include <linux/delay.h> #include <sound/core.h> #include <sound/emu8000.h> |