Merge tag 'cleanup-for-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/arm...

[cascardo/linux.git] / arch / arm / mach-shmobile / setup-r8a7779.c

diff --git a/arch/arm/mach-shmobile/setup-r8a7779.c b/arch/arm/mach-shmobile/setup-r8a7779.c
index aba4ed6..280303c 100644 (file)
--- a/arch/arm/mach-shmobile/setup-r8a7779.c
+++ b/arch/arm/mach-shmobile/setup-r8a7779.c
@@ -40,14 +40,14 @@
 #include <linux/usb/ehci_pdriver.h>
 #include <linux/usb/ohci_pdriver.h>
 #include <linux/pm_runtime.h>
-#include <mach/irqs.h>
 #include <mach/r8a7779.h>
-#include <mach/common.h>
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
 #include <asm/mach/time.h>
 #include <asm/mach/map.h>
 #include <asm/hardware/cache-l2x0.h>
+#include "common.h"
+#include "irqs.h"
 
 static struct map_desc r8a7779_io_desc[] __initdata = {
        /* 2M entity map for 0xf0000000 (MPCORE) */
@@ -123,7 +123,7 @@ void __init r8a7779_init_irq_extpin(int irlm)
        r8a7779_init_irq_extpin_dt(irlm);
        if (irlm)
                platform_device_register_resndata(
-                       &platform_bus, "renesas_intc_irqpin", -1,
+                       NULL, "renesas_intc_irqpin", -1,
                        irqpin0_resources, ARRAY_SIZE(irqpin0_resources),
                        &irqpin0_platform_data, sizeof(irqpin0_platform_data));
 }
@@ -632,8 +632,8 @@ static struct resource hpb_dmae_resources[] __initdata = {
 
 static void __init r8a7779_register_hpb_dmae(void)
 {
-       platform_device_register_resndata(&platform_bus, "hpb-dma-engine", -1,
-                                         hpb_dmae_resources,
+       platform_device_register_resndata(NULL, "hpb-dma-engine",
+                                         -1, hpb_dmae_resources,
                                          ARRAY_SIZE(hpb_dmae_resources),
                                          &dma_platform_data,
                                          sizeof(dma_platform_data));