diff options
Diffstat (limited to 'include/asm-powerpc/processor.h')
-rw-r--r-- | include/asm-powerpc/processor.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/include/asm-powerpc/processor.h b/include/asm-powerpc/processor.h index d12382d292d4..415fa393b00c 100644 --- a/include/asm-powerpc/processor.h +++ b/include/asm-powerpc/processor.h | |||
@@ -10,7 +10,6 @@ | |||
10 | * 2 of the License, or (at your option) any later version. | 10 | * 2 of the License, or (at your option) any later version. |
11 | */ | 11 | */ |
12 | 12 | ||
13 | #include <linux/config.h> | ||
14 | #include <asm/reg.h> | 13 | #include <asm/reg.h> |
15 | 14 | ||
16 | #ifndef __ASSEMBLY__ | 15 | #ifndef __ASSEMBLY__ |
@@ -50,6 +49,7 @@ | |||
50 | #define _CHRP_IBM 0x05 /* IBM chrp, the longtrail and longtrail 2 */ | 49 | #define _CHRP_IBM 0x05 /* IBM chrp, the longtrail and longtrail 2 */ |
51 | #define _CHRP_Pegasos 0x06 /* Genesi/bplan's Pegasos and Pegasos2 */ | 50 | #define _CHRP_Pegasos 0x06 /* Genesi/bplan's Pegasos and Pegasos2 */ |
52 | 51 | ||
52 | #ifdef __KERNEL__ | ||
53 | #define platform_is_pseries() (_machine == PLATFORM_PSERIES || \ | 53 | #define platform_is_pseries() (_machine == PLATFORM_PSERIES || \ |
54 | _machine == PLATFORM_PSERIES_LPAR) | 54 | _machine == PLATFORM_PSERIES_LPAR) |
55 | #define platform_is_lpar() (!!(_machine & PLATFORM_LPAR)) | 55 | #define platform_is_lpar() (!!(_machine & PLATFORM_LPAR)) |
@@ -68,7 +68,6 @@ extern int _chrp_type; | |||
68 | * vendor. Board revision is also made available. This will be moved | 68 | * vendor. Board revision is also made available. This will be moved |
69 | * elsewhere soon | 69 | * elsewhere soon |
70 | */ | 70 | */ |
71 | extern unsigned char ucSystemType; | ||
72 | extern unsigned char ucBoardRev; | 71 | extern unsigned char ucBoardRev; |
73 | extern unsigned char ucBoardRevMaj, ucBoardRevMin; | 72 | extern unsigned char ucBoardRevMaj, ucBoardRevMin; |
74 | 73 | ||
@@ -82,7 +81,7 @@ extern unsigned char ucBoardRevMaj, ucBoardRevMin; | |||
82 | #else | 81 | #else |
83 | #define _machine 0 | 82 | #define _machine 0 |
84 | #endif /* CONFIG_PPC_MULTIPLATFORM */ | 83 | #endif /* CONFIG_PPC_MULTIPLATFORM */ |
85 | 84 | #endif /* __KERNEL__ */ | |
86 | /* | 85 | /* |
87 | * Default implementation of macro that returns current | 86 | * Default implementation of macro that returns current |
88 | * instruction pointer ("program counter"). | 87 | * instruction pointer ("program counter"). |