summaryrefslogtreecommitdiffstats
path: root/drivers/char/dsp56k.c
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2010-08-06 19:13:54 +0200
committerRussell King <rmk+kernel@arm.linux.org.uk>2010-08-06 19:13:54 +0200
commit11e4afb49b7fa1fc8e1ffd850c1806dd86a08204 (patch)
tree9e57efcb106ae912f7bec718feb3f8ec607559bb /drivers/char/dsp56k.c
parentARM: 6131/1: MAINTAINERS: update for ARM/Gemini (diff)
parentARM: 6283/1: Remove useless PCIO_BASE definitions (diff)
downloadlinux-11e4afb49b7fa1fc8e1ffd850c1806dd86a08204.tar.xz
linux-11e4afb49b7fa1fc8e1ffd850c1806dd86a08204.zip
Merge branches 'gemini' and 'misc' into devel
Diffstat (limited to 'drivers/char/dsp56k.c')
-rw-r--r--drivers/char/dsp56k.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/char/dsp56k.c b/drivers/char/dsp56k.c
index 85832ab924e6..8a1b28a10ef0 100644
--- a/drivers/char/dsp56k.c
+++ b/drivers/char/dsp56k.c
@@ -24,7 +24,6 @@
*/
#include <linux/module.h>
-#include <linux/slab.h> /* for kmalloc() and kfree() */
#include <linux/major.h>
#include <linux/types.h>
#include <linux/errno.h>