Merge master.kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6

[linux-drm-fsl-dcu.git] / drivers / atm / adummy.c

diff --git a/drivers/atm/adummy.c b/drivers/atm/adummy.c
index ac2c10822be07c41e5f3995dee1f260099ce3bc2..2ebd07f2ef81d33f1d9d5824b3b68085944616f3 100644 (file)
--- a/drivers/atm/adummy.c
+++ b/drivers/atm/adummy.c
@@ -6,14 +6,12 @@
 #include <linux/version.h>
 #include <linux/kernel.h>
 #include <linux/skbuff.h>
-#include <linux/pci.h>
 #include <linux/errno.h>
 #include <linux/types.h>
 #include <linux/string.h>
 #include <linux/delay.h>
 #include <linux/init.h>
 #include <linux/mm.h>
-#include <linux/sched.h>
 #include <linux/timer.h>
 #include <linux/interrupt.h>
 #include <asm/io.h>