summaryrefslogtreecommitdiffstats
path: root/sound/pci/sis7019.c
diff options
context:
space:
mode:
authorNeilBrown <neilb@suse.de>2010-05-22 00:31:36 +0200
committerNeilBrown <neilb@suse.de>2010-05-22 00:31:36 +0200
commit19fdb9eefb21b72edbc365b838502780c392bad6 (patch)
treedeae04c48532d6eab64ed4b0396737bb854b5506 /sound/pci/sis7019.c
parentmd: don't insist on valid event count for spare devices. (diff)
parentsysfs: Implement sysfs tagged directory support. (diff)
downloadlinux-19fdb9eefb21b72edbc365b838502780c392bad6.tar.xz
linux-19fdb9eefb21b72edbc365b838502780c392bad6.zip
Merge commit '3ff195b011d7decf501a4d55aeed312731094796' into for-linus
Conflicts: drivers/md/md.c - Resolved conflict in md_update_sb - Added extra 'NULL' arg to new instance of sysfs_get_dirent. Signed-off-by: NeilBrown <neilb@suse.de>
Diffstat (limited to 'sound/pci/sis7019.c')
-rw-r--r--sound/pci/sis7019.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/pci/sis7019.c b/sound/pci/sis7019.c
index 7e3e8fbc90fe..9cc1b5aa0148 100644
--- a/sound/pci/sis7019.c
+++ b/sound/pci/sis7019.c
@@ -24,6 +24,7 @@
#include <linux/init.h>
#include <linux/pci.h>
#include <linux/time.h>
+#include <linux/slab.h>
#include <linux/moduleparam.h>
#include <linux/interrupt.h>
#include <linux/delay.h>