]> git.baikalelectronics.ru Git - kernel.git/commit
of/irq: Rename "intc_desc" to "of_intc_desc" to fix OF on sh
authorGeert Uytterhoeven <geert+renesas@glider.be>
Fri, 26 Jun 2015 12:42:45 +0000 (14:42 +0200)
committerGrant Likely <grant.likely@linaro.org>
Tue, 30 Jun 2015 16:03:57 +0000 (17:03 +0100)
commit582ad8aae4f4d25704a40419d360d5acf5fad03b
tree502b0e3584f52d387e0a70f2992bed1da88660ed
parent6b208455cd8c85c79d1eb8c64f8bfe2e9397dfbd
of/irq: Rename "intc_desc" to "of_intc_desc" to fix OF on sh

Now CONFIG_OF can be enabled on sh:

    drivers/of/irq.c:472:8: error: redefinition of 'struct intc_desc'
    include/linux/sh_intc.h:109:8: note: originally defined here

As "intc_desc" is used all over the place in sh platform code, while
drivers/of/irq.c has a local definition used in a single function,
rename the latter by prefixing it with "of_".

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Grant Likely <grant.likely@linaro.org>
drivers/of/irq.c