Merge branch 'for-linus' of git://one.firstfloor.org/home/andi/git/linux-2.6

[~andy/linux] / kernel / power / power.h

diff --git a/kernel/power/power.h b/kernel/power/power.h
index 1c6eef8df4ad8fbc857efdf241b4a219967c2c61..33bd94ceba32f16534f33b031a20521863f95bd5 100644 (file)
--- a/kernel/power/power.h
+++ b/kernel/power/power.h
@@ -37,7 +37,7 @@ static struct subsys_attribute _name##_attr = {       \
        .store  = _name##_store,                \
 }
 
-extern struct subsystem power_subsys;
+extern struct kset power_subsys;
 
 /* Preferred image size in bytes (default 500 MB) */
 extern unsigned long image_size;