diff options
-rw-r--r-- | arch/ppc/platforms/4xx/virtex-ii_pro.h | 2 | ||||
-rw-r--r-- | arch/ppc/platforms/4xx/xparameters/xparameters.h (renamed from include/asm-ppc/xparameters.h) | 0 | ||||
-rw-r--r-- | arch/ppc/syslib/xilinx_pic.c | 2 |
3 files changed, 2 insertions, 2 deletions
diff --git a/arch/ppc/platforms/4xx/virtex-ii_pro.h b/arch/ppc/platforms/4xx/virtex-ii_pro.h index 9014c4887339..026130c8e72a 100644 --- a/arch/ppc/platforms/4xx/virtex-ii_pro.h +++ b/arch/ppc/platforms/4xx/virtex-ii_pro.h | |||
@@ -16,7 +16,7 @@ | |||
16 | #define __ASM_VIRTEXIIPRO_H__ | 16 | #define __ASM_VIRTEXIIPRO_H__ |
17 | 17 | ||
18 | #include <linux/config.h> | 18 | #include <linux/config.h> |
19 | #include <asm/xparameters.h> | 19 | #include <platforms/4xx/xparameters/xparameters.h> |
20 | 20 | ||
21 | /* serial defines */ | 21 | /* serial defines */ |
22 | 22 | ||
diff --git a/include/asm-ppc/xparameters.h b/arch/ppc/platforms/4xx/xparameters/xparameters.h index fe4eac629139..fe4eac629139 100644 --- a/include/asm-ppc/xparameters.h +++ b/arch/ppc/platforms/4xx/xparameters/xparameters.h | |||
diff --git a/arch/ppc/syslib/xilinx_pic.c b/arch/ppc/syslib/xilinx_pic.c index 47f04c71fe9c..848fb512f3f8 100644 --- a/arch/ppc/syslib/xilinx_pic.c +++ b/arch/ppc/syslib/xilinx_pic.c | |||
@@ -15,7 +15,7 @@ | |||
15 | #include <linux/init.h> | 15 | #include <linux/init.h> |
16 | #include <linux/irq.h> | 16 | #include <linux/irq.h> |
17 | #include <asm/io.h> | 17 | #include <asm/io.h> |
18 | #include <asm/xparameters.h> | 18 | #include <platforms/4xx/xparameters/xparameters.h> |
19 | #include <asm/ibm4xx.h> | 19 | #include <asm/ibm4xx.h> |
20 | #include <asm/machdep.h> | 20 | #include <asm/machdep.h> |
21 | 21 | ||