Merge branch 'next/devel-samsung-pd' of git://git.kernel.org/pub/scm/linux/kernel...

[~andy/linux] / arch / arm / mach-exynos / mach-origen.c

diff --git a/arch/arm/mach-exynos/mach-origen.c b/arch/arm/mach-exynos/mach-origen.c
index 3ec3ccf9f35c97ec2662abc2877e57308996db4f..b4d032d5c878354c25888348c4b9138192a6b82b 100644 (file)
--- a/arch/arm/mach-exynos/mach-origen.c
+++ b/arch/arm/mach-exynos/mach-origen.c
@@ -621,13 +621,6 @@ static struct platform_device *origen_devices[] __initdata = {
        &s5p_device_mfc_r,
        &s5p_device_mixer,
        &exynos4_device_ohci,
-       &exynos4_device_pd[PD_LCD0],
-       &exynos4_device_pd[PD_TV],
-       &exynos4_device_pd[PD_G3D],
-       &exynos4_device_pd[PD_LCD1],
-       &exynos4_device_pd[PD_CAM],
-       &exynos4_device_pd[PD_GPS],
-       &exynos4_device_pd[PD_MFC],
        &origen_device_gpiokeys,
        &origen_lcd_hv070wsa,
 };
@@ -695,13 +688,6 @@ static void __init origen_machine_init(void)
 
        platform_add_devices(origen_devices, ARRAY_SIZE(origen_devices));
 
-       s5p_device_fimd0.dev.parent = &exynos4_device_pd[PD_LCD0].dev;
-
-       s5p_device_hdmi.dev.parent = &exynos4_device_pd[PD_TV].dev;
-       s5p_device_mixer.dev.parent = &exynos4_device_pd[PD_TV].dev;
-
-       s5p_device_mfc.dev.parent = &exynos4_device_pd[PD_MFC].dev;
-
        samsung_bl_set(&origen_bl_gpio_info, &origen_bl_data);
 }