diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-20 20:05:45 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-20 20:05:45 -0800 |
| commit | 6bd25e78211d0591060db3ece10443096ef96c50 (patch) | |
| tree | 95262e041c1451c8672cfcc580fc1e0e112a2603 /include | |
| parent | 35e622a67e6d2c5f7e3d3e2da92ebdb2f46db783 (diff) | |
| parent | 496b7a5159b8366b003bbc17f8c4e27f69b6779e (diff) | |
| download | linux-6bd25e78211d0591060db3ece10443096ef96c50.tar.gz | |
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 39200def8d116f..a3e8a45e45a9e4 100644 --- a/include/asm-ppc/machdep.h +++ b/include/asm-ppc/machdep.h @@ -154,19 +154,6 @@ extern char cmd_line[COMMAND_LINE_SIZE]; extern void setup_pci_ptrs(void); -/* - * Power macintoshes have either a CUDA or a PMU controlling - * system reset, power, NVRAM, RTC. - */ -typedef enum sys_ctrler_kind { - SYS_CTRLER_UNKNOWN = 0, - SYS_CTRLER_CUDA = 1, - SYS_CTRLER_PMU = 2, - SYS_CTRLER_SMU = 3, -} sys_ctrler_t; - -extern sys_ctrler_t sys_ctrler; - #ifdef CONFIG_SMP struct smp_ops_t { void (*message_pass)(int target, int msg); |