Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

powerpc/machdep: Move sys_ctrler_t definition into pmac_feature.h

sys_ctrler_t definitions are tied to pmac. Move it into pmac_feature.h

Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
[mpe: Move to pmac_feature.h to fix some build errors]
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/7dd5ead4bbca749e2da089ff6fe2b1878d6bf40e.1630667612.git.christophe.leroy@csgroup.eu

authored by

Christophe Leroy and committed by
Michael Ellerman
e6d03ac1 d6a6c725

+16 -15
-15
arch/powerpc/include/asm/machdep.h
··· 230 230 machine_id == &mach_##name; \ 231 231 }) 232 232 233 - #ifdef CONFIG_PPC_PMAC 234 - /* 235 - * Power macintoshes have either a CUDA, PMU or SMU controlling 236 - * system reset, power, NVRAM, RTC. 237 - */ 238 - typedef enum sys_ctrler_kind { 239 - SYS_CTRLER_UNKNOWN = 0, 240 - SYS_CTRLER_CUDA = 1, 241 - SYS_CTRLER_PMU = 2, 242 - SYS_CTRLER_SMU = 3, 243 - } sys_ctrler_t; 244 - extern sys_ctrler_t sys_ctrler; 245 - 246 - #endif /* CONFIG_PPC_PMAC */ 247 - 248 233 static inline void log_error(char *buf, unsigned int err_type, int fatal) 249 234 { 250 235 if (ppc_md.log_error)
+12
arch/powerpc/include/asm/pmac_feature.h
··· 401 401 */ 402 402 extern int pmac_get_uninorth_variant(void); 403 403 404 + /* 405 + * Power macintoshes have either a CUDA, PMU or SMU controlling 406 + * system reset, power, NVRAM, RTC. 407 + */ 408 + typedef enum sys_ctrler_kind { 409 + SYS_CTRLER_UNKNOWN = 0, 410 + SYS_CTRLER_CUDA = 1, 411 + SYS_CTRLER_PMU = 2, 412 + SYS_CTRLER_SMU = 3, 413 + } sys_ctrler_t; 414 + extern sys_ctrler_t sys_ctrler; 415 + 404 416 #endif /* __ASM_POWERPC_PMAC_FEATURE_H */ 405 417 #endif /* __KERNEL__ */
+2
arch/powerpc/platforms/powermac/pmac.h
··· 5 5 #include <linux/pci.h> 6 6 #include <linux/irq.h> 7 7 8 + #include <asm/pmac_feature.h> 9 + 8 10 /* 9 11 * Declaration for the various functions exported by the 10 12 * pmac_* files. Mostly for use by pmac_setup
+1
drivers/macintosh/via-cuda.c
··· 21 21 #ifdef CONFIG_PPC 22 22 #include <asm/prom.h> 23 23 #include <asm/machdep.h> 24 + #include <asm/pmac_feature.h> 24 25 #else 25 26 #include <asm/macintosh.h> 26 27 #include <asm/macints.h>
+1
sound/ppc/pmac.h
··· 26 26 #include <asm/dbdma.h> 27 27 #include <asm/prom.h> 28 28 #include <asm/machdep.h> 29 + #include <asm/pmac_feature.h> 29 30 30 31 /* maximum number of fragments */ 31 32 #define PMAC_MAX_FRAGS 32