diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2012-02-22 18:35:03 -0500 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2012-02-22 18:41:19 -0700 |
| commit | 6d166fec12967063e0e709a935bba8c48fcde99e (patch) | |
| tree | d3b5ebace827366ca46b82cf9930f656329b25ab | |
| parent | 2462bacd0334d918f9fcd79fc59c403b76b36f8a (diff) | |
| download | linux-6d166fec12967063e0e709a935bba8c48fcde99e.tar.gz | |
ppc-6xx: fix build failure in flipper-pic.c and hlwd-pic.c
The commit bae1d8f19983fbfa25559aa3cb6a81a84aa82a18 (linux-next) "irq_domain/powerpc: Use common irq_domain structure instead of irq_host" made this change: -static struct irq_host *flipper_irq_host; +static struct irq_domain *flipper_irq_host; and this change: -static struct irq_host *hlwd_irq_host; +static struct irq_domain *hlwd_irq_host; The intent was to change the type, and not the name, but then in a couple of instances, it looks like the sed to change the irq_domain_ops name inadvertently also changed the irq_host name where it was not supposed to, causing build failures. Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
| -rw-r--r-- | arch/powerpc/platforms/embedded6xx/flipper-pic.c | 6 | ||||
| -rw-r--r-- | arch/powerpc/platforms/embedded6xx/hlwd-pic.c | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/arch/powerpc/platforms/embedded6xx/flipper-pic.c b/arch/powerpc/platforms/embedded6xx/flipper-pic.c index 675335a52648..53d6eee01963 100644 --- a/arch/powerpc/platforms/embedded6xx/flipper-pic.c +++ b/arch/powerpc/platforms/embedded6xx/flipper-pic.c @@ -172,7 +172,7 @@ out: unsigned int flipper_pic_get_irq(void) { - void __iomem *io_base = flipper_irq_domain->host_data; + void __iomem *io_base = flipper_irq_host->host_data; int irq; u32 irq_status; @@ -182,7 +182,7 @@ unsigned int flipper_pic_get_irq(void) return NO_IRQ; /* no more IRQs pending */ irq = __ffs(irq_status); - return irq_linear_revmap(flipper_irq_domain, irq); + return irq_linear_revmap(flipper_irq_host, irq); } /* @@ -197,7 +197,7 @@ void __init flipper_pic_probe(void) np = of_find_compatible_node(NULL, NULL, "nintendo,flipper-pic"); BUG_ON(!np); - flipper_irq_domain = flipper_pic_init(np); + flipper_irq_host = flipper_pic_init(np); BUG_ON(!flipper_irq_host); irq_set_default_host(flipper_irq_host); diff --git a/arch/powerpc/platforms/embedded6xx/hlwd-pic.c b/arch/powerpc/platforms/embedded6xx/hlwd-pic.c index da6ca02c43ac..3006b5117ec6 100644 --- a/arch/powerpc/platforms/embedded6xx/hlwd-pic.c +++ b/arch/powerpc/platforms/embedded6xx/hlwd-pic.c @@ -189,7 +189,7 @@ struct irq_domain *hlwd_pic_init(struct device_node *np) unsigned int hlwd_pic_get_irq(void) { - return __hlwd_pic_get_irq(hlwd_irq_domain); + return __hlwd_pic_get_irq(hlwd_irq_host); } /* @@ -213,7 +213,7 @@ void hlwd_pic_probe(void) irq_set_handler_data(cascade_virq, host); irq_set_chained_handler(cascade_virq, hlwd_pic_irq_cascade); - hlwd_irq_domain = host; + hlwd_irq_host = host; break; } } @@ -227,7 +227,7 @@ void hlwd_pic_probe(void) */ void hlwd_quiesce(void) { - void __iomem *io_base = hlwd_irq_domain->host_data; + void __iomem *io_base = hlwd_irq_host->host_data; __hlwd_quiesce(io_base); } |