Commit f4dcd3c2 authored by Becky Bruce's avatar Becky Bruce Committed by Paul Mackerras

[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: default avatarBecky Bruce <becky.bruce@freescale.com>
Signed-off-by: default avatarKumar Gala <galak@kernel.crashing.org>
parent b2cd6415
...@@ -5,8 +5,8 @@ ...@@ -5,8 +5,8 @@
* this one and the configuration switching is done here. * this one and the configuration switching is done here.
*/ */
#ifdef __KERNEL__ #ifdef __KERNEL__
#ifndef __ASM_PPC_MPC8260_H__ #ifndef __ASM_POWERPC_MPC8260_H__
#define __ASM_PPC_MPC8260_H__ #define __ASM_POWERPC_MPC8260_H__
#ifdef CONFIG_8260 #ifdef CONFIG_8260
...@@ -20,5 +20,5 @@ ...@@ -20,5 +20,5 @@
#endif #endif
#endif /* CONFIG_8260 */ #endif /* CONFIG_8260 */
#endif /* !__ASM_PPC_MPC8260_H__ */ #endif /* !__ASM_POWERPC_MPC8260_H__ */
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */
...@@ -28,8 +28,8 @@ ...@@ -28,8 +28,8 @@
*/ */
#ifdef __KERNEL__ #ifdef __KERNEL__
#ifndef __PPC_ASM_PMAC_FEATURE_H #ifndef __ASM_POWERPC_PMAC_FEATURE_H
#define __PPC_ASM_PMAC_FEATURE_H #define __ASM_POWERPC_PMAC_FEATURE_H
#include <asm/macio.h> #include <asm/macio.h>
#include <asm/machdep.h> #include <asm/machdep.h>
...@@ -393,5 +393,5 @@ extern u32 __iomem *uninorth_base; ...@@ -393,5 +393,5 @@ extern u32 __iomem *uninorth_base;
#define UN_BIC(r,v) (UN_OUT((r), UN_IN(r) & ~(v))) #define UN_BIC(r,v) (UN_OUT((r), UN_IN(r) & ~(v)))
#endif /* __PPC_ASM_PMAC_FEATURE_H */ #endif /* __ASM_POWERPC_PMAC_FEATURE_H */
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */
...@@ -26,8 +26,8 @@ ...@@ -26,8 +26,8 @@
* demultiplexing on TSI108EMU/SVB boards. * demultiplexing on TSI108EMU/SVB boards.
*/ */
#ifndef _ASM_PPC_TSI108_IRQ_H #ifndef _ASM_POWERPC_TSI108_IRQ_H
#define _ASM_PPC_TSI108_IRQ_H #define _ASM_POWERPC_TSI108_IRQ_H
/* /*
* Tsi108 interrupts * Tsi108 interrupts
...@@ -121,4 +121,4 @@ typedef enum { ...@@ -121,4 +121,4 @@ typedef enum {
TSI108_IRQ_DIRECTED, TSI108_IRQ_DIRECTED,
TSI108_IRQ_DISTRIBUTED, TSI108_IRQ_DISTRIBUTED,
} TSI108_IRQ_MODE; } TSI108_IRQ_MODE;
#endif /* _ASM_PPC_TSI108_IRQ_H */ #endif /* _ASM_POWERPC_TSI108_IRQ_H */
...@@ -18,8 +18,8 @@ ...@@ -18,8 +18,8 @@
* MA 02111-1307 USA * MA 02111-1307 USA
*/ */
#ifndef _ASM_PPC_TSI108_PCI_H #ifndef _ASM_POWERPC_TSI108_PCI_H
#define _ASM_PPC_TSI108_PCI_H #define _ASM_POWERPC_TSI108_PCI_H
#include <asm/tsi108.h> #include <asm/tsi108.h>
...@@ -42,4 +42,4 @@ extern void tsi108_pci_int_init(struct device_node *node); ...@@ -42,4 +42,4 @@ extern void tsi108_pci_int_init(struct device_node *node);
extern void tsi108_irq_cascade(unsigned int irq, struct irq_desc *desc); extern void tsi108_irq_cascade(unsigned int irq, struct irq_desc *desc);
extern void tsi108_clear_pci_cfg_error(void); extern void tsi108_clear_pci_cfg_error(void);
#endif /* _ASM_PPC_TSI108_PCI_H */ #endif /* _ASM_POWERPC_TSI108_PCI_H */
#ifndef _ASM_PPC_UNISTD_H_ #ifndef _ASM_POWERPC_UNISTD_H_
#define _ASM_PPC_UNISTD_H_ #define _ASM_POWERPC_UNISTD_H_
/* /*
* This file contains the system call numbers. * This file contains the system call numbers.
...@@ -381,4 +381,4 @@ ...@@ -381,4 +381,4 @@
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLY__ */
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */
#endif /* _ASM_PPC_UNISTD_H_ */ #endif /* _ASM_POWERPC_UNISTD_H_ */
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment