From 5dfd048c53ab26b80d6ea42caaa8b88ab1470480 Mon Sep 17 00:00:00 2001 From: Lee Jones Date: Fri, 15 Jun 2012 17:37:44 +0100 Subject: [PATCH] --- yaml --- r: 313353 b: refs/heads/master c: da38487000de965bb94b8f4bca88eade4bb9a485 h: refs/heads/master i: 313351: 41be503c7300b97a4d53cd709449c5856a24ae30 v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-ux500/cpu-db8500.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index c18bc2f82203..31b8a786e852 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fc67a597a25684084c539a369c09684bf3c0d88e +refs/heads/master: da38487000de965bb94b8f4bca88eade4bb9a485 diff --git a/trunk/arch/arm/mach-ux500/cpu-db8500.c b/trunk/arch/arm/mach-ux500/cpu-db8500.c index a12bd9eff08b..c8dd94f606dc 100644 --- a/trunk/arch/arm/mach-ux500/cpu-db8500.c +++ b/trunk/arch/arm/mach-ux500/cpu-db8500.c @@ -139,7 +139,6 @@ static struct platform_device *platform_devs[] __initdata = { static struct platform_device *of_platform_devs[] __initdata = { &u8500_dma40_device, - &db8500_pmu_device, }; static resource_size_t __initdata db8500_gpio_base[] = { @@ -248,7 +247,7 @@ struct device * __init u8500_of_init_devices(void) /* * Devices to be DT:ed: * u8500_dma40_device = todo - * db8500_pmu_device = todo + * db8500_pmu_device = done * db8500_prcmu_device = done */ platform_add_devices(of_platform_devs, ARRAY_SIZE(of_platform_devs));