Merge branch 'for-linus' into for-next

[linux-2.6-microblaze.git] / kernel / power / power.h

diff --git a/kernel/power/power.h b/kernel/power/power.h
index 1ca7531..15f37ea 100644 (file)
--- a/kernel/power/power.h
+++ b/kernel/power/power.h
@@ -2,6 +2,7 @@
 #include <linux/suspend_ioctls.h>
 #include <linux/utsname.h>
 #include <linux/freezer.h>
+#include <linux/compiler.h>
 
 struct swsusp_info {
        struct new_utsname      uts;
@@ -11,7 +12,7 @@ struct swsusp_info {
        unsigned long           image_pages;
        unsigned long           pages;
        unsigned long           size;
-} __attribute__((aligned(PAGE_SIZE)));
+} __aligned(PAGE_SIZE);
 
 #ifdef CONFIG_HIBERNATION
 /* kernel/power/snapshot.c */