Skip to content

Commit

Permalink
[POWERPC] Change include protections to ASM_POWERPC
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Becky Bruce authored and Paul Mackerras committed May 17, 2007
1 parent b2cd641 commit f4dcd3c
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 15 deletions.
6 changes: 3 additions & 3 deletions include/asm-powerpc/mpc8260.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -20,5 +20,5 @@
#endif

#endif /* CONFIG_8260 */
#endif /* !__ASM_PPC_MPC8260_H__ */
#endif /* !__ASM_POWERPC_MPC8260_H__ */
#endif /* __KERNEL__ */
6 changes: 3 additions & 3 deletions include/asm-powerpc/pmac_feature.h
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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__ */
6 changes: 3 additions & 3 deletions include/asm-powerpc/tsi108_irq.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 */
6 changes: 3 additions & 3 deletions include/asm-powerpc/tsi108_pci.h
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand All @@ -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 */
6 changes: 3 additions & 3 deletions include/asm-powerpc/unistd.h
Original file line number Diff line number Diff line change
@@ -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.
Expand Down Expand Up @@ -381,4 +381,4 @@
#endif /* __ASSEMBLY__ */
#endif /* __KERNEL__ */

#endif /* _ASM_PPC_UNISTD_H_ */
#endif /* _ASM_POWERPC_UNISTD_H_ */

0 comments on commit f4dcd3c

Please sign in to comment.