summaryrefslogtreecommitdiffstats
path: root/drivers/atm/adummy.c
diff options
context:
space:
mode:
authorPaul Mackerras2007-05-08 05:37:51 +0200
committerPaul Mackerras2007-05-08 05:37:51 +0200
commit02bbc0f09c90cefdb2837605c96a66c5ce4ba2e1 (patch)
tree04ef573cd4de095c500c9fc3477f4278c0b36300 /drivers/atm/adummy.c
parent[POWERPC] Holly bootwrapper (diff)
parentMerge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 (diff)
downloadkernel-qcow2-linux-02bbc0f09c90cefdb2837605c96a66c5ce4ba2e1.tar.gz
kernel-qcow2-linux-02bbc0f09c90cefdb2837605c96a66c5ce4ba2e1.tar.xz
kernel-qcow2-linux-02bbc0f09c90cefdb2837605c96a66c5ce4ba2e1.zip
Merge branch 'linux-2.6'
Diffstat (limited to 'drivers/atm/adummy.c')
-rw-r--r--drivers/atm/adummy.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/atm/adummy.c b/drivers/atm/adummy.c
index 8d60c4eb54fe..2ebd07f2ef81 100644
--- a/drivers/atm/adummy.c
+++ b/drivers/atm/adummy.c
@@ -6,7 +6,6 @@
#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>