summaryrefslogtreecommitdiff
path: root/sound/isa/sb/emu8000_patch.c
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2012-02-18 03:08:20 +0400
committerTony Lindgren <tony@atomide.com>2012-02-18 03:08:20 +0400
commitb0ee4e394009f02a1d1b166091a19e8b842b4ea4 (patch)
tree75e6df725e5402ed6fe9d78f23bf5cf45cfdf9d9 /sound/isa/sb/emu8000_patch.c
parentabe763f2bccbc592d33a3a9c334acaefea022c0a (diff)
parent03e4fd6eb25e6b46536ecdb0d1b7d33d46b15480 (diff)
downloadlinux-b0ee4e394009f02a1d1b166091a19e8b842b4ea4.tar.xz
Merge branch 'for_3.3/fixes/pm' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into fixes
Diffstat (limited to 'sound/isa/sb/emu8000_patch.c')
-rw-r--r--sound/isa/sb/emu8000_patch.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/sound/isa/sb/emu8000_patch.c b/sound/isa/sb/emu8000_patch.c
index e09f144177f5..c99c6078be33 100644
--- a/sound/isa/sb/emu8000_patch.c
+++ b/sound/isa/sb/emu8000_patch.c
@@ -22,7 +22,6 @@
#include "emu8000_local.h"
#include <asm/uaccess.h>
#include <linux/moduleparam.h>
-#include <linux/moduleparam.h>
static int emu8000_reset_addr;
module_param(emu8000_reset_addr, int, 0444);