aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-powerpc
diff options
context:
space:
mode:
authorBecky Bruce <becky.bruce@freescale.com>2007-05-10 11:13:04 -0400
committerPaul Mackerras <paulus@samba.org>2007-05-17 07:10:15 -0400
commitf4dcd3c229a0745aff7d6835ca7c45aaeb293714 (patch)
treeff81ad203cd331ffb8fd6a82d2392aeecd1acc87 /include/asm-powerpc
parentb2cd64153b94473f6bd82448a68b8e8c041676ea (diff)
[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>
Diffstat (limited to 'include/asm-powerpc')
-rw-r--r--include/asm-powerpc/mpc8260.h6
-rw-r--r--include/asm-powerpc/pmac_feature.h6
-rw-r--r--include/asm-powerpc/tsi108_irq.h6
-rw-r--r--include/asm-powerpc/tsi108_pci.h6
-rw-r--r--include/asm-powerpc/unistd.h6
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 @@
5 * this one and the configuration switching is done here. 5 * this one and the configuration switching is done here.
6 */ 6 */
7#ifdef __KERNEL__ 7#ifdef __KERNEL__
8#ifndef __ASM_PPC_MPC8260_H__ 8#ifndef __ASM_POWERPC_MPC8260_H__
9#define __ASM_PPC_MPC8260_H__ 9#define __ASM_POWERPC_MPC8260_H__
10 10
11 11
12#ifdef CONFIG_8260 12#ifdef CONFIG_8260
@@ -20,5 +20,5 @@
20#endif 20#endif
21 21
22#endif /* CONFIG_8260 */ 22#endif /* CONFIG_8260 */
23#endif /* !__ASM_PPC_MPC8260_H__ */ 23#endif /* !__ASM_POWERPC_MPC8260_H__ */
24#endif /* __KERNEL__ */ 24#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 @@
28 */ 28 */
29 29
30#ifdef __KERNEL__ 30#ifdef __KERNEL__
31#ifndef __PPC_ASM_PMAC_FEATURE_H 31#ifndef __ASM_POWERPC_PMAC_FEATURE_H
32#define __PPC_ASM_PMAC_FEATURE_H 32#define __ASM_POWERPC_PMAC_FEATURE_H
33 33
34#include <asm/macio.h> 34#include <asm/macio.h>
35#include <asm/machdep.h> 35#include <asm/machdep.h>
@@ -393,5 +393,5 @@ extern u32 __iomem *uninorth_base;
393#define UN_BIC(r,v) (UN_OUT((r), UN_IN(r) & ~(v))) 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#endif /* __KERNEL__ */ 397#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 @@
26 * demultiplexing on TSI108EMU/SVB boards. 26 * demultiplexing on TSI108EMU/SVB boards.
27 */ 27 */
28 28
29#ifndef _ASM_PPC_TSI108_IRQ_H 29#ifndef _ASM_POWERPC_TSI108_IRQ_H
30#define _ASM_PPC_TSI108_IRQ_H 30#define _ASM_POWERPC_TSI108_IRQ_H
31 31
32/* 32/*
33 * Tsi108 interrupts 33 * Tsi108 interrupts
@@ -121,4 +121,4 @@ typedef enum {
121 TSI108_IRQ_DIRECTED, 121 TSI108_IRQ_DIRECTED,
122 TSI108_IRQ_DISTRIBUTED, 122 TSI108_IRQ_DISTRIBUTED,
123} TSI108_IRQ_MODE; 123} TSI108_IRQ_MODE;
124#endif /* _ASM_PPC_TSI108_IRQ_H */ 124#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 @@
18 * MA 02111-1307 USA 18 * MA 02111-1307 USA
19 */ 19 */
20 20
21#ifndef _ASM_PPC_TSI108_PCI_H 21#ifndef _ASM_POWERPC_TSI108_PCI_H
22#define _ASM_PPC_TSI108_PCI_H 22#define _ASM_POWERPC_TSI108_PCI_H
23 23
24#include <asm/tsi108.h> 24#include <asm/tsi108.h>
25 25
@@ -42,4 +42,4 @@ extern void tsi108_pci_int_init(struct device_node *node);
42extern void tsi108_irq_cascade(unsigned int irq, struct irq_desc *desc); 42extern void tsi108_irq_cascade(unsigned int irq, struct irq_desc *desc);
43extern void tsi108_clear_pci_cfg_error(void); 43extern void tsi108_clear_pci_cfg_error(void);
44 44
45#endif /* _ASM_PPC_TSI108_PCI_H */ 45#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 @@
1#ifndef _ASM_PPC_UNISTD_H_ 1#ifndef _ASM_POWERPC_UNISTD_H_
2#define _ASM_PPC_UNISTD_H_ 2#define _ASM_POWERPC_UNISTD_H_
3 3
4/* 4/*
5 * This file contains the system call numbers. 5 * This file contains the system call numbers.
@@ -381,4 +381,4 @@
381#endif /* __ASSEMBLY__ */ 381#endif /* __ASSEMBLY__ */
382#endif /* __KERNEL__ */ 382#endif /* __KERNEL__ */
383 383
384#endif /* _ASM_PPC_UNISTD_H_ */ 384#endif /* _ASM_POWERPC_UNISTD_H_ */