summaryrefslogtreecommitdiffstats
path: root/arch/ppc/platforms/cpci690.c
diff options
context:
space:
mode:
authorSam Ravnborg <sam@mars.ravnborg.org>2006-07-03 23:24:23 +0200
committerSam Ravnborg <sam@mars.ravnborg.org>2006-07-03 23:24:23 +0200
commit05668381140309088443bf5dc53add4104610fbb (patch)
treeed53039717390e1a71ff16209281b1f1c8d3e6be /arch/ppc/platforms/cpci690.c
parentkbuild: explicit turn off gcc stack-protector (diff)
parent[PATCH] genirq: Fixup ARM devel merge (diff)
downloadlinux-05668381140309088443bf5dc53add4104610fbb.tar.xz
linux-05668381140309088443bf5dc53add4104610fbb.zip
Merge branch 'master' of /home/sam/kernel/linux-2.6/
Diffstat (limited to 'arch/ppc/platforms/cpci690.c')
-rw-r--r--arch/ppc/platforms/cpci690.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/ppc/platforms/cpci690.c b/arch/ppc/platforms/cpci690.c
index 790475c22fd7..e78bccf96c9d 100644
--- a/arch/ppc/platforms/cpci690.c
+++ b/arch/ppc/platforms/cpci690.c
@@ -8,7 +8,6 @@
* is licensed "as is" without any warranty of any kind, whether express
* or implied.
*/
-#include <linux/config.h>
#include <linux/delay.h>
#include <linux/pci.h>
#include <linux/ide.h>