diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2012-03-04 23:11:20 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rjw@sisk.pl> | 2012-03-04 23:11:20 +0100 |
| commit | 48ed00031681c373ff81e78fd248710fe4cddda0 (patch) | |
| tree | dd90809d6017924ee528114a4205ab8cfd8422af /arch/arm/mach-exynos/mach-nuri.c | |
| parent | 643161ace2a7624fd0106ede12ae43bcbbfc1de0 (diff) | |
| parent | b642631d38c28fefd1232a6b96713eb54b60130d (diff) | |
| download | linux-48ed00031681c373ff81e78fd248710fe4cddda0.tar.gz linux-48ed00031681c373ff81e78fd248710fe4cddda0.tar.xz linux-48ed00031681c373ff81e78fd248710fe4cddda0.zip | |
Merge branch 'pm-domains'
* pm-domains:
PM / Domains: Fix include for PM_GENERIC_DOMAINS=n case
PM / Domains: Provide a dummy dev_gpd_data() when generic domains are not used
PM / Domains: Run late/early device suspend callbacks at the right time
ARM: EXYNOS: Hook up power domains to generic power domain infrastructure
PM / Domains: Add OF support
Diffstat (limited to 'arch/arm/mach-exynos/mach-nuri.c')
| -rw-r--r-- | arch/arm/mach-exynos/mach-nuri.c | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/arch/arm/mach-exynos/mach-nuri.c b/arch/arm/mach-exynos/mach-nuri.c index 435261f83f46..aa37179d776c 100644 --- a/arch/arm/mach-exynos/mach-nuri.c +++ b/arch/arm/mach-exynos/mach-nuri.c @@ -1263,9 +1263,6 @@ static struct platform_device *nuri_devices[] __initdata = { &s5p_device_mfc, &s5p_device_mfc_l, &s5p_device_mfc_r, - &exynos4_device_pd[PD_MFC], - &exynos4_device_pd[PD_LCD0], - &exynos4_device_pd[PD_CAM], &s5p_device_fimc_md, /* NURI Devices */ @@ -1315,14 +1312,6 @@ static void __init nuri_machine_init(void) /* Last */ platform_add_devices(nuri_devices, ARRAY_SIZE(nuri_devices)); - s5p_device_mfc.dev.parent = &exynos4_device_pd[PD_MFC].dev; - s5p_device_fimd0.dev.parent = &exynos4_device_pd[PD_LCD0].dev; - - s5p_device_fimc0.dev.parent = &exynos4_device_pd[PD_CAM].dev; - s5p_device_fimc1.dev.parent = &exynos4_device_pd[PD_CAM].dev; - s5p_device_fimc2.dev.parent = &exynos4_device_pd[PD_CAM].dev; - s5p_device_fimc3.dev.parent = &exynos4_device_pd[PD_CAM].dev; - s5p_device_mipi_csis0.dev.parent = &exynos4_device_pd[PD_CAM].dev; } MACHINE_START(NURI, "NURI") |