ACPI: check a return value correctly in acpi_power_get_context()

[linux-2.6-omap-h63xx.git] / include / linux / eventpoll.h

diff --git a/include/linux/eventpoll.h b/include/linux/eventpoll.h
index d2a96cbf4f0eeac7b9d01ae11a7553a3be4f0d92..cf79853967ffb25b839e7c77c3bf8ef9956d95e8 100644 (file)
--- a/include/linux/eventpoll.h
+++ b/include/linux/eventpoll.h
@@ -32,18 +32,13 @@
  * On x86-64 make the 64bit structure have the same alignment as the
  * 32bit structure. This makes 32bit emulation easier.
  *
- * UML/x86_64 needs the same packing as x86_64 - UML + UML_X86 +
- * 64_BIT adds up to UML/x86_64.
+ * UML/x86_64 needs the same packing as x86_64
  */
 #ifdef __x86_64__
 #define EPOLL_PACKED __attribute__((packed))
 #else
-#if defined(CONFIG_UML) && defined(CONFIG_UML_X86) && defined(CONFIG_64BIT)
-#define EPOLL_PACKED __attribute__((packed))
-#else
 #define EPOLL_PACKED
 #endif
-#endif
 
 struct epoll_event {
        __u32 events;