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

[cascardo/linux.git] / arch / arm / mach-shmobile / board-marzen.c

diff --git a/arch/arm/mach-shmobile/board-marzen.c b/arch/arm/mach-shmobile/board-marzen.c
index fe445ef..d0b5b74 100644 (file)
--- a/arch/arm/mach-shmobile/board-marzen.c
+++ b/arch/arm/mach-shmobile/board-marzen.c
@@ -272,7 +272,6 @@ static struct resource vin##idx##_resources[] __initdata = {        \
 };                                                             \
                                                                \
 static struct platform_device_info vin##idx##_info __initdata = { \
-       .parent         = &platform_bus,                        \
        .name           = "r8a7779-vin",                        \
        .id             = idx,                                  \
        .res            = vin##idx##_resources,                 \