Merge tag 'kconfig-v5.1' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy...

[sfrench/cifs-2.6.git] / arch / arm / mach-davinci / dm644x.c

diff --git a/arch/arm/mach-davinci/dm644x.c b/arch/arm/mach-davinci/dm644x.c
index 0b0ecac364869fca92c385b9e16f12412a893730..cecc7ceb8d34a67259dd9f4ef7d64953a2efec60 100644 (file)
--- a/arch/arm/mach-davinci/dm644x.c
+++ b/arch/arm/mach-davinci/dm644x.c
@@ -646,9 +646,6 @@ static const struct davinci_soc_info davinci_soc_info_dm644x = {
        .pinmux_base            = DAVINCI_SYSTEM_MODULE_BASE,
        .pinmux_pins            = dm644x_pins,
        .pinmux_pins_num        = ARRAY_SIZE(dm644x_pins),
-       .intc_base              = DAVINCI_ARM_INTC_BASE,
-       .intc_irq_prios         = dm644x_default_priorities,
-       .intc_irq_num           = DAVINCI_N_AINTC_IRQ,
        .timer_info             = &dm644x_timer_info,
        .emac_pdata             = &dm644x_emac_pdata,
        .sram_dma               = 0x00008000,
@@ -741,7 +738,7 @@ static const struct davinci_aintc_config dm644x_aintc_config = {
 
 void __init dm644x_init_irq(void)
 {
-       davinci_aintc_init();
+       davinci_aintc_init(&dm644x_aintc_config);
 }
 
 void __init dm644x_init_devices(void)