From patchwork Wed Jul 14 11:22:25 2010
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: manjugk manjugk <manjugk@ti.com>
X-Patchwork-Id: 111934
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by demeter.kernel.org (8.14.4/8.14.3) with ESMTP id o6EBP5V0015079
	for <patchwork-omap@patchwork.kernel.org>;
	Wed, 14 Jul 2010 11:25:05 GMT
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1754787Ab0GNLZD (ORCPT
	<rfc822;patchwork-omap@patchwork.kernel.org>);
	Wed, 14 Jul 2010 07:25:03 -0400
Received: from comal.ext.ti.com ([198.47.26.152]:41766 "EHLO
	comal.ext.ti.com"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1753565Ab0GNLZB (ORCPT <rfc822;linux-omap@vger.kernel.org>);
	Wed, 14 Jul 2010 07:25:01 -0400
Received: from dbdp31.itg.ti.com ([172.24.170.98])
	by comal.ext.ti.com (8.13.7/8.13.7) with ESMTP id o6EBOndN010996
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO);
	Wed, 14 Jul 2010 06:24:51 -0500
Received: from localhost.localdomain (localhost [127.0.0.1])
	by dbdp31.itg.ti.com (8.13.8/8.13.8) with ESMTP id o6EBOkaN013323;
	Wed, 14 Jul 2010 16:54:47 +0530 (IST)
From: Manjunatha GK <manjugk@ti.com>
To: linux-omap@vger.kernel.org
Cc: Kevin Hilman <khilman@deeprootsystems.com>
Subject: [PATCH] OMAP1: PM: Fix OMAP1610 build
Date: Wed, 14 Jul 2010 16:52:25 +0530
Message-Id: <1279106545-3018-1-git-send-email-manjugk@ti.com>
X-Mailer: git-send-email 1.7.0.4
Sender: linux-omap-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-omap.vger.kernel.org>
X-Mailing-List: linux-omap@vger.kernel.org
X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by
	milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]);
	Wed, 14 Jul 2010 11:25:06 +0000 (UTC)


diff --git a/arch/arm/mach-omap1/pm_bus.c b/arch/arm/mach-omap1/pm_bus.c
index 29d651a..6c5ab40 100644
--- a/arch/arm/mach-omap1/pm_bus.c
+++ b/arch/arm/mach-omap1/pm_bus.c
@@ -15,6 +15,8 @@
 #include <linux/pm_runtime.h>
 #include <linux/platform_device.h>
 #include <linux/mutex.h>
+#include <linux/clk.h>
+#include <linux/err.h>
 
 #include <plat/omap_device.h>
 #include <plat/omap-pm.h>
@@ -23,6 +25,7 @@
 int platform_pm_runtime_suspend(struct device *dev)
 {
 	struct clk *iclk, *fclk;
+	int ret = 0;
 
 	dev_dbg(dev, "%s\n", __func__);
 
@@ -46,7 +49,7 @@ int platform_pm_runtime_suspend(struct device *dev)
 
 int platform_pm_runtime_resume(struct device *dev)
 {
-	int r, ret = 0;
+	int ret = 0;
 	struct clk *iclk, *fclk;
 
 	iclk = clk_get(dev, "ick");
@@ -69,6 +72,7 @@ int platform_pm_runtime_resume(struct device *dev)
 
 int platform_pm_runtime_idle(struct device *dev)
 {
+	int ret = 0;
 	ret = pm_runtime_suspend(dev);
 	dev_dbg(dev, "%s [%d]\n", __func__, ret);