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

[POWERPC] Change include protections to ASM_POWERPC

Change several headers in include/asm-powerpc that currently use some variation
of ASM_PPC to use ASM_POWERPC instead.

Signed-off-by: Becky Bruce <becky.bruce@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>

authored by Becky Bruce and committed by Paul Mackerras f4dcd3c2 b2cd6415

+15 -15
unified split
+3 -3
include/asm-powerpc/mpc8260.h
··· 5 5 * this one and the configuration switching is done here. 6 6 */ 7 7 #ifdef __KERNEL__ 8 - #ifndef __ASM_PPC_MPC8260_H__ 9 - #define __ASM_PPC_MPC8260_H__ 8 + #ifndef __ASM_POWERPC_MPC8260_H__ 9 + #define __ASM_POWERPC_MPC8260_H__ 10 10 11 11 12 12 #ifdef CONFIG_8260 ··· 20 20 #endif 21 21 22 22 #endif /* CONFIG_8260 */ 23 - #endif /* !__ASM_PPC_MPC8260_H__ */ 23 + #endif /* !__ASM_POWERPC_MPC8260_H__ */ 24 24 #endif /* __KERNEL__ */
+3 -3
include/asm-powerpc/pmac_feature.h
··· 28 28 */ 29 29 30 30 #ifdef __KERNEL__ 31 - #ifndef __PPC_ASM_PMAC_FEATURE_H 32 - #define __PPC_ASM_PMAC_FEATURE_H 31 + #ifndef __ASM_POWERPC_PMAC_FEATURE_H 32 + #define __ASM_POWERPC_PMAC_FEATURE_H 33 33 34 34 #include <asm/macio.h> 35 35 #include <asm/machdep.h> ··· 393 393 #define UN_BIC(r,v) (UN_OUT((r), UN_IN(r) & ~(v))) 394 394 395 395 396 - #endif /* __PPC_ASM_PMAC_FEATURE_H */ 396 + #endif /* __ASM_POWERPC_PMAC_FEATURE_H */ 397 397 #endif /* __KERNEL__ */
+3 -3
include/asm-powerpc/tsi108_irq.h
··· 26 26 * demultiplexing on TSI108EMU/SVB boards. 27 27 */ 28 28 29 - #ifndef _ASM_PPC_TSI108_IRQ_H 30 - #define _ASM_PPC_TSI108_IRQ_H 29 + #ifndef _ASM_POWERPC_TSI108_IRQ_H 30 + #define _ASM_POWERPC_TSI108_IRQ_H 31 31 32 32 /* 33 33 * Tsi108 interrupts ··· 121 121 TSI108_IRQ_DIRECTED, 122 122 TSI108_IRQ_DISTRIBUTED, 123 123 } TSI108_IRQ_MODE; 124 - #endif /* _ASM_PPC_TSI108_IRQ_H */ 124 + #endif /* _ASM_POWERPC_TSI108_IRQ_H */
+3 -3
include/asm-powerpc/tsi108_pci.h
··· 18 18 * MA 02111-1307 USA 19 19 */ 20 20 21 - #ifndef _ASM_PPC_TSI108_PCI_H 22 - #define _ASM_PPC_TSI108_PCI_H 21 + #ifndef _ASM_POWERPC_TSI108_PCI_H 22 + #define _ASM_POWERPC_TSI108_PCI_H 23 23 24 24 #include <asm/tsi108.h> 25 25 ··· 42 42 extern void tsi108_irq_cascade(unsigned int irq, struct irq_desc *desc); 43 43 extern void tsi108_clear_pci_cfg_error(void); 44 44 45 - #endif /* _ASM_PPC_TSI108_PCI_H */ 45 + #endif /* _ASM_POWERPC_TSI108_PCI_H */
+3 -3
include/asm-powerpc/unistd.h
··· 1 - #ifndef _ASM_PPC_UNISTD_H_ 2 - #define _ASM_PPC_UNISTD_H_ 1 + #ifndef _ASM_POWERPC_UNISTD_H_ 2 + #define _ASM_POWERPC_UNISTD_H_ 3 3 4 4 /* 5 5 * This file contains the system call numbers. ··· 381 381 #endif /* __ASSEMBLY__ */ 382 382 #endif /* __KERNEL__ */ 383 383 384 - #endif /* _ASM_PPC_UNISTD_H_ */ 384 + #endif /* _ASM_POWERPC_UNISTD_H_ */