summaryrefslogtreecommitdiff
path: root/include/asm-sparc
diff options
context:
space:
mode:
authorDavid Woodhouse <dwmw2@infradead.org>2006-09-21 08:48:27 +0100
committerDavid Woodhouse <dwmw2@infradead.org>2006-09-21 08:48:27 +0100
commit09087a1a8722fac30b1969a4a542cde064af13f8 (patch)
treef49a0f35ea85e2756c147269da11c8526112cbbf /include/asm-sparc
parent47dbec79d1b9ce9e80bed932f345adc92049f05d (diff)
Fix exported headers for SPARC, SPARC64
Mostly removing files which have no business being used in userspace. Signed-off-by: David Woodhouse <dwmw2@infradead.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/asm-sparc')
-rw-r--r--include/asm-sparc/Kbuild7
-rw-r--r--include/asm-sparc/page.h8
2 files changed, 4 insertions, 11 deletions
diff --git a/include/asm-sparc/Kbuild b/include/asm-sparc/Kbuild
index b22b67a64ec..c6a55cf0d33 100644
--- a/include/asm-sparc/Kbuild
+++ b/include/asm-sparc/Kbuild
@@ -2,20 +2,13 @@ include include/asm-generic/Kbuild.asm
header-y += apc.h
header-y += asi.h
-header-y += auxio.h
header-y += bpp.h
-header-y += head.h
-header-y += ipc.h
header-y += jsflash.h
header-y += openpromio.h
-header-y += pbm.h
header-y += pconf.h
-header-y += pgtsun4.h
header-y += reg.h
header-y += traps.h
-header-y += turbosparc.h
header-y += vfc_ioctls.h
-header-y += winmacro.h
unifdef-y += fbio.h
unifdef-y += perfctr.h
diff --git a/include/asm-sparc/page.h b/include/asm-sparc/page.h
index 5bab8a7c25c..ff57648eb8f 100644
--- a/include/asm-sparc/page.h
+++ b/include/asm-sparc/page.h
@@ -8,6 +8,8 @@
#ifndef _SPARC_PAGE_H
#define _SPARC_PAGE_H
+#ifdef __KERNEL__
+
#ifdef CONFIG_SUN4
#define PAGE_SHIFT 13
#else
@@ -21,8 +23,6 @@
#endif
#define PAGE_MASK (~(PAGE_SIZE-1))
-#ifdef __KERNEL__
-
#include <asm/btfixup.h>
#ifndef __ASSEMBLY__
@@ -160,9 +160,9 @@ extern unsigned long pfn_base;
#define VM_DATA_DEFAULT_FLAGS (VM_READ | VM_WRITE | VM_EXEC | \
VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
-#endif /* __KERNEL__ */
-
#include <asm-generic/memory_model.h>
#include <asm-generic/page.h>
+#endif /* __KERNEL__ */
+
#endif /* _SPARC_PAGE_H */