summaryrefslogtreecommitdiffstats
path: root/arch/sparc/mm/swift.S
diff options
context:
space:
mode:
authorTrond Myklebust <Trond.Myklebust@netapp.com>2006-07-03 19:49:45 +0200
committerTrond Myklebust <Trond.Myklebust@netapp.com>2006-07-03 19:49:45 +0200
commit026477c1141b67e98e3bd8bdedb7d4b88a3ecd09 (patch)
tree2624a44924c625c367f3cebf937853b9da2de282 /arch/sparc/mm/swift.S
parentMerge branch 'master' of /home/trondmy/kernel/linux-2.6/ (diff)
parent[PATCH] genirq: Fixup ARM devel merge (diff)
downloadlinux-026477c1141b67e98e3bd8bdedb7d4b88a3ecd09.tar.xz
linux-026477c1141b67e98e3bd8bdedb7d4b88a3ecd09.zip
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/
Diffstat (limited to 'arch/sparc/mm/swift.S')
-rw-r--r--arch/sparc/mm/swift.S1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/sparc/mm/swift.S b/arch/sparc/mm/swift.S
index cd90f3fdc4e7..9f4cd396a0fa 100644
--- a/arch/sparc/mm/swift.S
+++ b/arch/sparc/mm/swift.S
@@ -4,7 +4,6 @@
* Copyright (C) 1999 David S. Miller (davem@redhat.com)
*/
-#include <linux/config.h>
#include <asm/psr.h>
#include <asm/asi.h>
#include <asm/page.h>