Merge nuts.ninka.net:/disk1/davem/BK/sparcwork-2.5

into nuts.ninka.net:/disk1/davem/BK/sparc-2.5

Merge nuts.ninka.net:/disk1/davem/BK/sparcwork-2.5
into nuts.ninka.net:/disk1/davem/BK/sparc-2.5
28cacc5a · David S. Miller · b1ed3e69 · aa2516a9 · 28cacc5a · 28cacc5a
Commit 28cacc5a authored Oct 29, 2003 by David S. Miller
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 2 deletions

include/asm-sparc/bitext.h include/asm-sparc/bitext.h +1 -1

include/asm-sparc/pcic.h include/asm-sparc/pcic.h +0 -1

No files found.
--- a/include/asm-sparc/bitext.h
+++ b/include/asm-sparc/bitext.h
@@ -7,7 +7,7 @@
 #ifndef _SPARC_BITEXT_H
 #define _SPARC_BITEXT_H
-#include <linux/smp_lock.h>
+#include <linux/spinlock.h>
 struct bit_map {
 	spinlock_t lock;

--- a/include/asm-sparc/pcic.h
+++ b/include/asm-sparc/pcic.h
@@ -11,7 +11,6 @@
 #include <linux/types.h>
 #include <linux/smp.h>
-#include <linux/smp_lock.h>
 #include <linux/pci.h>
 #include <linux/ioport.h>
 #include <asm/pbm.h>