aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
Diffstat (limited to 'arch')
-rw-r--r--arch/powerpc/platforms/44x/Makefile2
-rw-r--r--arch/powerpc/platforms/44x/ppc476.c (renamed from arch/powerpc/platforms/44x/currituck.c)8
2 files changed, 5 insertions, 5 deletions
diff --git a/arch/powerpc/platforms/44x/Makefile b/arch/powerpc/platforms/44x/Makefile
index d03833abec09..f896b896b64e 100644
--- a/arch/powerpc/platforms/44x/Makefile
+++ b/arch/powerpc/platforms/44x/Makefile
@@ -10,4 +10,4 @@ obj-$(CONFIG_XILINX_VIRTEX_5_FXT) += virtex.o
10obj-$(CONFIG_XILINX_ML510) += virtex_ml510.o 10obj-$(CONFIG_XILINX_ML510) += virtex_ml510.o
11obj-$(CONFIG_ISS4xx) += iss4xx.o 11obj-$(CONFIG_ISS4xx) += iss4xx.o
12obj-$(CONFIG_CANYONLANDS)+= canyonlands.o 12obj-$(CONFIG_CANYONLANDS)+= canyonlands.o
13obj-$(CONFIG_CURRITUCK) += currituck.o 13obj-$(CONFIG_CURRITUCK) += ppc476.o
diff --git a/arch/powerpc/platforms/44x/currituck.c b/arch/powerpc/platforms/44x/ppc476.c
index 7f1b71a01c6a..c6c5a6f28ff5 100644
--- a/arch/powerpc/platforms/44x/currituck.c
+++ b/arch/powerpc/platforms/44x/ppc476.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * Currituck board specific routines 2 * PowerPC 476FPE board specific routines
3 * 3 *
4 * Copyright © 2011 Tony Breeds IBM Corporation 4 * Copyright © 2011 Tony Breeds IBM Corporation
5 * 5 *
@@ -36,7 +36,7 @@
36 36
37#include <linux/pci.h> 37#include <linux/pci.h>
38 38
39static __initdata struct of_device_id ppc47x_of_bus[] = { 39static struct of_device_id ppc47x_of_bus[] __initdata = {
40 { .compatible = "ibm,plb4", }, 40 { .compatible = "ibm,plb4", },
41 { .compatible = "ibm,plb6", }, 41 { .compatible = "ibm,plb6", },
42 { .compatible = "ibm,opb", }, 42 { .compatible = "ibm,opb", },
@@ -157,7 +157,7 @@ static void __init ppc47x_setup_arch(void)
157{ 157{
158 158
159 /* No need to check the DMA config as we /know/ our windows are all of 159 /* No need to check the DMA config as we /know/ our windows are all of
160 * RAM. Lets hope that doesn't change */ 160 * RAM. Lets hope that doesn't change */
161 swiotlb_detect_4g(); 161 swiotlb_detect_4g();
162 162
163 ppc47x_smp_init(); 163 ppc47x_smp_init();
@@ -208,7 +208,7 @@ machine_arch_initcall(ppc47x, ppc47x_get_board_rev);
208static void ppc47x_pci_irq_fixup(struct pci_dev *dev) 208static void ppc47x_pci_irq_fixup(struct pci_dev *dev)
209{ 209{
210 if (dev->vendor == 0x1033 && (dev->device == 0x0035 || 210 if (dev->vendor == 0x1033 && (dev->device == 0x0035 ||
211 dev->device == 0x00e0)) { 211 dev->device == 0x00e0)) {
212 if (board_rev == 0) { 212 if (board_rev == 0) {
213 dev->irq = irq_create_mapping(NULL, 47); 213 dev->irq = irq_create_mapping(NULL, 47);
214 pr_info("%s: Mapping irq %d\n", __func__, dev->irq); 214 pr_info("%s: Mapping irq %d\n", __func__, dev->irq);