4 files changed, 7 insertions, 8 deletions

diff --git a/include/asm-sparc/Kbuild b/include/asm-sparc/Kbuild
index c8432483628e..c83e3c0aa30b 100644
--- a/include/asm-sparc/Kbuild
+++ b/include/asm-sparc/Kbuild
@@ -6,6 +6,7 @@ header-y += bpp.h
 header-y += display7seg.h
 header-y += envctrl.h
 header-y += jsflash.h
+header-y += openprom.h
 header-y += openpromio.h
 header-y += psrcompat.h
 header-y += pstate.h
diff --git a/include/asm-sparc/openprom.h b/include/asm-sparc/openprom.h
index ed4b6bc2b102..e812cf3b0de7 100644
--- a/include/asm-sparc/openprom.h
+++ b/include/asm-sparc/openprom.h
@@ -7,8 +7,6 @@
  * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu)
  */
 
-#include <asm/vaddrs.h>
-
 /* Empirical constants... */
 #define LINUX_OPPROM_MAGIC      0x10010407
 
diff --git a/include/asm-sparc/pgtable.h b/include/asm-sparc/pgtable.h
index 60512296b2ca..b63ac6b4119f 100644
--- a/include/asm-sparc/pgtable.h
+++ b/include/asm-sparc/pgtable.h
@@ -8,6 +8,7 @@
  *  Copyright (C) 1998 Jakub Jelinek (jj@sunsite.mff.cuni.cz)
  */
 
+#ifndef __ASSEMBLY__
 #include <asm-generic/4level-fixup.h>
 
 #include <linux/spinlock.h>
@@ -24,7 +25,6 @@
 #include <asm/btfixup.h>
 #include <asm/system.h>
 
-#ifndef __ASSEMBLY__
 
 struct vm_area_struct;
 struct page;
@@ -464,6 +464,11 @@ extern int io_remap_pfn_range(struct vm_area_struct *vma,
 
 #endif /* !(__ASSEMBLY__) */
 
+#define VMALLOC_START           0xfe600000
+/* XXX Alter this when I get around to fixing sun4c - Anton */
+#define VMALLOC_END             0xffc00000
+
+
 /* We provide our own get_unmapped_area to cope with VA holes for userland */
 #define HAVE_ARCH_UNMAPPED_AREA
 
diff --git a/include/asm-sparc/vaddrs.h b/include/asm-sparc/vaddrs.h
index f6ca4779056c..a22fed5a3c6b 100644
--- a/include/asm-sparc/vaddrs.h
+++ b/include/asm-sparc/vaddrs.h
@@ -34,11 +34,6 @@
 #define IOBASE_VADDR            0xfe000000
 #define IOBASE_END              0xfe600000
 
-#define VMALLOC_START           0xfe600000
-
-/* XXX Alter this when I get around to fixing sun4c - Anton */
-#define VMALLOC_END             0xffc00000
-
 /*
  * On the sun4/4c we need a place
  * to reliably map locked down kernel data.  This includes the