From: Paul Walmsley <paul@pwsan.com>
Date: Tue, 8 May 2007 21:39:00 +0000 (-0600)
Subject: update mach-omap2/pm.c for struct subsystem removal
X-Git-Tag: v2.6.22-omap1~159
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=1ad29237b231fef4e5a22125e1a4f5658ac1a330;p=linux-2.6-omap-h63xx.git

update mach-omap2/pm.c for struct subsystem removal

'struct subsystem' is no more, replaced with 'struct kset': commit
823bccfc4002296ba88c3ad0f049e1abd8108d30.  Fixes the following
warnings:

  CC      arch/arm/mach-omap2/pm.o
arch/arm/mach-omap2/pm.c:410: warning: 'struct subsystem' declared inside parameter list
arch/arm/mach-omap2/pm.c:410: warning: its scope is only this definition or declaration, which is probably not what you want
arch/arm/mach-omap2/pm.c:417: warning: 'struct subsystem' declared inside parameter list
arch/arm/mach-omap2/pm.c:434: warning: initialization from incompatible pointer type
arch/arm/mach-omap2/pm.c:435: warning: initialization from incompatible pointer type

Compile-tested only.

Signed-off-by: Paul Walmsley <paul@pwsan.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
---

diff --git a/arch/arm/mach-omap2/pm.c b/arch/arm/mach-omap2/pm.c
index 0a88c6a148c..4a8e99be698 100644
--- a/arch/arm/mach-omap2/pm.c
+++ b/arch/arm/mach-omap2/pm.c
@@ -407,12 +407,12 @@ static inline void serial_console_fclk_mask(u32 *f1, u32 *f2) {}
 
 static unsigned short enable_dyn_sleep = 0; /* disabled till drivers are fixed */
 
-static ssize_t omap_pm_sleep_while_idle_show(struct subsystem * subsys, char *buf)
+static ssize_t omap_pm_sleep_while_idle_show(struct kset * subsys, char *buf)
 {
 	return sprintf(buf, "%hu\n", enable_dyn_sleep);
 }
 
-static ssize_t omap_pm_sleep_while_idle_store(struct subsystem * subsys,
+static ssize_t omap_pm_sleep_while_idle_store(struct kset * subsys,
 					      const char * buf,
 					      size_t n)
 {