diff options
| author | David S. Miller <davem@nuts.ninka.net> | 2003-10-29 20:58:15 -0800 |
|---|---|---|
| committer | David S. Miller <davem@nuts.ninka.net> | 2003-10-29 20:58:15 -0800 |
| commit | 28cacc5a3fa7882a9f1a1a94fdf4b5d3bb073ec5 (patch) | |
| tree | df874caabc47d39ff32ec3af72f0d70a3fc0b420 | |
| parent | b1ed3e695e6cd3132f3187110ecaf82491808e39 (diff) | |
| parent | aa2516a9b971744140089f2cb0a11e592d8806c8 (diff) | |
Merge nuts.ninka.net:/disk1/davem/BK/sparcwork-2.5
into nuts.ninka.net:/disk1/davem/BK/sparc-2.5
| -rw-r--r-- | include/asm-sparc/bitext.h | 2 | ||||
| -rw-r--r-- | include/asm-sparc/pcic.h | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/include/asm-sparc/bitext.h b/include/asm-sparc/bitext.h index 88b1518834a8..b589241b5bfa 100644 --- 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; diff --git a/include/asm-sparc/pcic.h b/include/asm-sparc/pcic.h index df81f14ff14c..471f05a0109b 100644 --- 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> |