summaryrefslogtreecommitdiffstats
path: root/drivers/isdn/capi/capidrv.c
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2007-02-17 21:11:43 +0100
committerJeff Garzik <jeff@garzik.org>2007-02-17 21:11:43 +0100
commitf630fe2817601314b2eb7ca5ddc23c7834646731 (patch)
tree3bfb4939b7bbc3859575ca8b58fa3f929b015941 /drivers/isdn/capi/capidrv.c
parentMerge branch 'gfar' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powe... (diff)
parentMerge branch 'for-linus' of git://www.atmel.no/~hskinnemoen/linux/kernel/avr32 (diff)
downloadlinux-f630fe2817601314b2eb7ca5ddc23c7834646731.tar.xz
linux-f630fe2817601314b2eb7ca5ddc23c7834646731.zip
Merge branch 'master' into upstream
Diffstat (limited to 'drivers/isdn/capi/capidrv.c')
-rw-r--r--drivers/isdn/capi/capidrv.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/isdn/capi/capidrv.c b/drivers/isdn/capi/capidrv.c
index 8cec9c3898ec..2a49cea0a223 100644
--- a/drivers/isdn/capi/capidrv.c
+++ b/drivers/isdn/capi/capidrv.c
@@ -13,7 +13,6 @@
#include <linux/errno.h>
#include <linux/kernel.h>
#include <linux/major.h>
-#include <linux/sched.h>
#include <linux/slab.h>
#include <linux/fcntl.h>
#include <linux/fs.h>