diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-20 23:05:45 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-20 23:05:45 -0500 |
| commit | 6bd25e78211d0591060db3ece10443096ef96c50 (patch) | |
| tree | 95262e041c1451c8672cfcc580fc1e0e112a2603 /include | |
| parent | 35e622a67e6d2c5f7e3d3e2da92ebdb2f46db783 (diff) | |
| parent | 496b7a5159b8366b003bbc17f8c4e27f69b6779e (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-ppc/machdep.h | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/include/asm-ppc/machdep.h b/include/asm-ppc/machdep.h index 39200def8d11..a3e8a45e45a9 100644 --- a/include/asm-ppc/machdep.h +++ b/include/asm-ppc/machdep.h | |||
| @@ -154,19 +154,6 @@ extern char cmd_line[COMMAND_LINE_SIZE]; | |||
| 154 | 154 | ||
| 155 | extern void setup_pci_ptrs(void); | 155 | extern void setup_pci_ptrs(void); |
| 156 | 156 | ||
| 157 | /* | ||
| 158 | * Power macintoshes have either a CUDA or a PMU controlling | ||
| 159 | * system reset, power, NVRAM, RTC. | ||
| 160 | */ | ||
| 161 | typedef enum sys_ctrler_kind { | ||
| 162 | SYS_CTRLER_UNKNOWN = 0, | ||
| 163 | SYS_CTRLER_CUDA = 1, | ||
| 164 | SYS_CTRLER_PMU = 2, | ||
| 165 | SYS_CTRLER_SMU = 3, | ||
| 166 | } sys_ctrler_t; | ||
| 167 | |||
| 168 | extern sys_ctrler_t sys_ctrler; | ||
| 169 | |||
| 170 | #ifdef CONFIG_SMP | 157 | #ifdef CONFIG_SMP |
| 171 | struct smp_ops_t { | 158 | struct smp_ops_t { |
| 172 | void (*message_pass)(int target, int msg); | 159 | void (*message_pass)(int target, int msg); |