diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-02-22 22:04:41 (GMT) |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-02-22 22:04:41 (GMT) |
commit | 61b80086a525c8a6081257ae40da5dee2bcaee16 (patch) | |
tree | 675da35e4c03be3a5ca17bf6430e5b51dfed6296 /sound/isa | |
parent | a5f17d1f4c2831b9b9bf8b1a537cdbac995d6e13 (diff) | |
parent | 230f984662d7e0e4a9597c665fd4f53130666e7d (diff) | |
download | linux-61b80086a525c8a6081257ae40da5dee2bcaee16.tar.xz |
Merge branch 'entry-macro-cleanup' of git://sources.calxeda.com/kernel/linux into for-armsoc
Diffstat (limited to 'sound/isa')
-rw-r--r-- | sound/isa/sb/emu8000_patch.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sound/isa/sb/emu8000_patch.c b/sound/isa/sb/emu8000_patch.c index e09f144..c99c607 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); |