summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorKyle McMartin <kyle@parisc-linux.org>2006-12-14 11:12:50 -0500
committerKyle McMartin <kyle@athena.road.mcmartin.ca>2007-02-17 00:43:10 -0500
commit959f4f13a3fe661ee2761c4dc9a70196fb8b1c12 (patch)
tree6e1d438f8350f201c7b940716930b1e2d634ee06 /include
parentaf5917f0cd60715ed09874bb793d4f62ba692f47 (diff)
[PARISC] "Fix" circular includes
Use a really big hammer for the mean time to get things building again. Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
Diffstat (limited to 'include')
-rw-r--r--include/asm-parisc/pgtable.h1
-rw-r--r--include/asm-parisc/processor.h5
-rw-r--r--include/asm-parisc/spinlock_types.h4
3 files changed, 1 insertions, 9 deletions
diff --git a/include/asm-parisc/pgtable.h b/include/asm-parisc/pgtable.h
index c0b61e0d149..d7e1b10da5c 100644
--- a/include/asm-parisc/pgtable.h
+++ b/include/asm-parisc/pgtable.h
@@ -10,7 +10,6 @@
* we simulate an x86-style page table for the linux mm code
*/
-#include <linux/spinlock.h>
#include <linux/mm.h> /* for vm_area_struct */
#include <asm/processor.h>
#include <asm/cache.h>
diff --git a/include/asm-parisc/processor.h b/include/asm-parisc/processor.h
index 435afe5a149..78ac4d9fa4d 100644
--- a/include/asm-parisc/processor.h
+++ b/include/asm-parisc/processor.h
@@ -9,13 +9,10 @@
#define __ASM_PARISC_PROCESSOR_H
#ifndef __ASSEMBLY__
-#include <asm/prefetch.h> /* lockdep.h needs <linux/prefetch.h> */
-
#include <linux/threads.h>
-#include <linux/spinlock_types.h>
+#include <asm/prefetch.h>
#include <asm/hardware.h>
-#include <asm/page.h>
#include <asm/pdc.h>
#include <asm/ptrace.h>
#include <asm/types.h>
diff --git a/include/asm-parisc/spinlock_types.h b/include/asm-parisc/spinlock_types.h
index d6b479bdb88..3f72f47cf4b 100644
--- a/include/asm-parisc/spinlock_types.h
+++ b/include/asm-parisc/spinlock_types.h
@@ -1,10 +1,6 @@
#ifndef __ASM_SPINLOCK_TYPES_H
#define __ASM_SPINLOCK_TYPES_H
-#ifndef __LINUX_SPINLOCK_TYPES_H
-# error "please don't include this file directly"
-#endif
-
typedef struct {
#ifdef CONFIG_PA20
volatile unsigned int slock;