From: Tony Lindgren <tony@atomide.com>
Date: Tue, 8 May 2007 01:59:43 +0000 (-0700)
Subject: ARM: OMAP: Use right type for power_subsys
X-Git-Tag: v2.6.22-omap1~170
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=efc879abfc00398ba351a00e073c1dc12f592a37;p=linux-2.6-omap-h63xx.git

ARM: OMAP: Use right type for power_subsys

Use right type for power_subsys

Signed-off-by: Tony Lindgren <tony@atomide.com>
---

diff --git a/arch/arm/mach-omap1/pm.c b/arch/arm/mach-omap1/pm.c
index cef5ff02a2f..b482bbba537 100644
--- a/arch/arm/mach-omap1/pm.c
+++ b/arch/arm/mach-omap1/pm.c
@@ -99,7 +99,6 @@ static struct subsys_attribute sleep_while_idle_attr = {
 	.store  = omap_pm_sleep_while_idle_store,
 };
 
-extern struct kset power_subsys;
 static void (*omap_sram_idle)(void) = NULL;
 static void (*omap_sram_suspend)(unsigned long r0, unsigned long r1) = NULL;
 
diff --git a/include/asm-arm/arch-omap/pm.h b/include/asm-arm/arch-omap/pm.h
index 34f971bf3bf..297590308d1 100644
--- a/include/asm-arm/arch-omap/pm.h
+++ b/include/asm-arm/arch-omap/pm.h
@@ -115,7 +115,7 @@
 
 #include <linux/clk.h>
 
-extern struct subsystem power_subsys;
+extern struct kset power_subsys;
 
 extern void prevent_idle_sleep(void);
 extern void allow_idle_sleep(void);