aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-powerpc/bootx.h
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2005-12-16 16:43:46 -0500
committerPaul Mackerras <paulus@samba.org>2006-01-08 23:13:08 -0500
commit88ced0314938814e1772b4d0d7ab20c52e4472b6 (patch)
tree3e06de882c0bf5706ee7a8994e06eb8c9ed3feca /include/asm-powerpc/bootx.h
parente1333803c3a8fb167ba67ffc5540dbb53fa7deb3 (diff)
[PATCH] powerpc: sanitize header files for user space includes
include/asm-ppc/ had #ifdef __KERNEL__ in all header files that are not meant for use by user space, include/asm-powerpc does not have this yet. This patch gets us a lot closer there. There are a few cases where I was not sure, so I left them out. I have verified that no CONFIG_* symbols are used outside of __KERNEL__ any more and that there are no obvious compile errors when including any of the headers in user space libraries. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'include/asm-powerpc/bootx.h')
-rw-r--r--include/asm-powerpc/bootx.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/include/asm-powerpc/bootx.h b/include/asm-powerpc/bootx.h
index ed626b7cbf22..57b82e3f89ce 100644
--- a/include/asm-powerpc/bootx.h
+++ b/include/asm-powerpc/bootx.h
@@ -9,6 +9,8 @@
9#ifndef __ASM_BOOTX_H__ 9#ifndef __ASM_BOOTX_H__
10#define __ASM_BOOTX_H__ 10#define __ASM_BOOTX_H__
11 11
12#include <asm/types.h>
13
12#ifdef macintosh 14#ifdef macintosh
13#include <Types.h> 15#include <Types.h>
14#include "linux_type_defs.h" 16#include "linux_type_defs.h"
@@ -122,6 +124,7 @@ typedef struct boot_infos
122 124
123} boot_infos_t; 125} boot_infos_t;
124 126
127#ifdef __KERNEL__
125/* (*) The format of the colormap is 256 * 3 * 2 bytes. Each color index 128/* (*) The format of the colormap is 256 * 3 * 2 bytes. Each color index
126 * is represented by 3 short words containing a 16 bits (unsigned) color 129 * is represented by 3 short words containing a 16 bits (unsigned) color
127 * component. Later versions may contain the gamma table for direct-color 130 * component. Later versions may contain the gamma table for direct-color
@@ -159,6 +162,8 @@ struct bootx_dt_node {
159 162
160extern void bootx_init(unsigned long r4, unsigned long phys); 163extern void bootx_init(unsigned long r4, unsigned long phys);
161 164
165#endif /* __KERNEL__ */
166
162#ifdef macintosh 167#ifdef macintosh
163#pragma options align=reset 168#pragma options align=reset
164#endif 169#endif