diff options
| author |   Becky Bruce <becky.bruce@freescale.com> | 2007-05-10 10:13:04 -0500 |
|---|---|---|
| committer |   Paul Mackerras <paulus@samba.org> | 2007-05-17 21:10:15 +1000 |
| commit | f4dcd3c229a0745aff7d6835ca7c45aaeb293714 (patch) | |
| tree | ff81ad203cd331ffb8fd6a82d2392aeecd1acc87 | |
| parent | Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev (diff) | |
| download | linux-dev-f4dcd3c229a0745aff7d6835ca7c45aaeb293714.tar.xz linux-dev-f4dcd3c229a0745aff7d6835ca7c45aaeb293714.zip | |
[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>
| -rw-r--r-- | include/asm-powerpc/mpc8260.h | 6 | ||||
| -rw-r--r-- | include/asm-powerpc/pmac_feature.h | 6 | ||||
| -rw-r--r-- | include/asm-powerpc/tsi108_irq.h | 6 | ||||
| -rw-r--r-- | include/asm-powerpc/tsi108_pci.h | 6 | ||||
| -rw-r--r-- | include/asm-powerpc/unistd.h | 6 |
5 files changed, 15 insertions, 15 deletions
diff --git a/include/asm-powerpc/mpc8260.h b/include/asm-powerpc/mpc8260.h index f1b83b09ab2e..e0d480790e12 100644 --- a/include/asm-powerpc/mpc8260.h +++ b/include/asm-powerpc/mpc8260.h @@ -5,8 +5,8 @@ * this one and the configuration switching is done here. */ #ifdef __KERNEL__ -#ifndef __ASM_PPC_MPC8260_H__ -#define __ASM_PPC_MPC8260_H__ +#ifndef __ASM_POWERPC_MPC8260_H__ +#define __ASM_POWERPC_MPC8260_H__ #ifdef CONFIG_8260 @@ -20,5 +20,5 @@ #endif #endif /* CONFIG_8260 */ -#endif /* !__ASM_PPC_MPC8260_H__ */ +#endif /* !__ASM_POWERPC_MPC8260_H__ */ #endif /* __KERNEL__ */ diff --git a/include/asm-powerpc/pmac_feature.h b/include/asm-powerpc/pmac_feature.h index d43d91beba9b..26bcb0aa164a 100644 --- a/include/asm-powerpc/pmac_feature.h +++ b/include/asm-powerpc/pmac_feature.h @@ -28,8 +28,8 @@ */ #ifdef __KERNEL__ -#ifndef __PPC_ASM_PMAC_FEATURE_H -#define __PPC_ASM_PMAC_FEATURE_H +#ifndef __ASM_POWERPC_PMAC_FEATURE_H +#define __ASM_POWERPC_PMAC_FEATURE_H #include <asm/macio.h> #include <asm/machdep.h> @@ -393,5 +393,5 @@ extern u32 __iomem *uninorth_base; #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__ */ diff --git a/include/asm-powerpc/tsi108_irq.h b/include/asm-powerpc/tsi108_irq.h index 3e4d04effa57..6ed93979fbe4 100644 --- a/include/asm-powerpc/tsi108_irq.h +++ b/include/asm-powerpc/tsi108_irq.h @@ -26,8 +26,8 @@ * demultiplexing on TSI108EMU/SVB boards. */ -#ifndef _ASM_PPC_TSI108_IRQ_H -#define _ASM_PPC_TSI108_IRQ_H +#ifndef _ASM_POWERPC_TSI108_IRQ_H +#define _ASM_POWERPC_TSI108_IRQ_H /* * Tsi108 interrupts @@ -121,4 +121,4 @@ typedef enum { TSI108_IRQ_DIRECTED, TSI108_IRQ_DISTRIBUTED, } TSI108_IRQ_MODE; -#endif /* _ASM_PPC_TSI108_IRQ_H */ +#endif /* _ASM_POWERPC_TSI108_IRQ_H */ diff --git a/include/asm-powerpc/tsi108_pci.h b/include/asm-powerpc/tsi108_pci.h index a9f92f73232c..5653d7cc3e24 100644 --- a/include/asm-powerpc/tsi108_pci.h +++ b/include/asm-powerpc/tsi108_pci.h @@ -18,8 +18,8 @@ * MA 02111-1307 USA */ -#ifndef _ASM_PPC_TSI108_PCI_H -#define _ASM_PPC_TSI108_PCI_H +#ifndef _ASM_POWERPC_TSI108_PCI_H +#define _ASM_POWERPC_TSI108_PCI_H #include <asm/tsi108.h> @@ -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_clear_pci_cfg_error(void); -#endif /* _ASM_PPC_TSI108_PCI_H */ +#endif /* _ASM_POWERPC_TSI108_PCI_H */ diff --git a/include/asm-powerpc/unistd.h b/include/asm-powerpc/unistd.h index 21f004aef508..908dfe4c2bfa 100644 --- a/include/asm-powerpc/unistd.h +++ b/include/asm-powerpc/unistd.h @@ -1,5 +1,5 @@ -#ifndef _ASM_PPC_UNISTD_H_ -#define _ASM_PPC_UNISTD_H_ +#ifndef _ASM_POWERPC_UNISTD_H_ +#define _ASM_POWERPC_UNISTD_H_ /* * This file contains the system call numbers. @@ -381,4 +381,4 @@ #endif /* __ASSEMBLY__ */ #endif /* __KERNEL__ */ -#endif /* _ASM_PPC_UNISTD_H_ */ +#endif /* _ASM_POWERPC_UNISTD_H_ */ |