diff --git a/[refs] b/[refs]
index 0028bb274063..aa2cbb64a678 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 39adc483d378f79711f291539f20e3797337892d
+refs/heads/master: 268a207563f933ff8e3d876866c324b4247f234e
diff --git a/trunk/include/xen/acpi.h b/trunk/include/xen/acpi.h
index c962d5f5b38b..68d73d09b770 100644
--- a/trunk/include/xen/acpi.h
+++ b/trunk/include/xen/acpi.h
@@ -57,21 +57,6 @@ void xen_stub_processor_exit(void);
 void xen_pcpu_hotplug_sync(void);
 int xen_pcpu_id(uint32_t acpi_id);
 
-int xen_acpi_notify_hypervisor_state(u8 sleep_state,
-				     u32 pm1a_cnt, u32 pm1b_cnd);
-
-static inline void xen_acpi_sleep_register(void)
-{
-	if (xen_initial_domain())
-		acpi_os_set_prepare_sleep(
-			&xen_acpi_notify_hypervisor_state);
-}
-#else
-static inline void xen_acpi_sleep_register(void)
-{
-}
-#endif
-
 static inline int xen_acpi_get_pxm(acpi_handle h)
 {
 	unsigned long long pxm;
@@ -90,4 +75,19 @@ static inline int xen_acpi_get_pxm(acpi_handle h)
 	return -ENXIO;
 }
 
+int xen_acpi_notify_hypervisor_state(u8 sleep_state,
+				     u32 pm1a_cnt, u32 pm1b_cnd);
+
+static inline void xen_acpi_sleep_register(void)
+{
+	if (xen_initial_domain())
+		acpi_os_set_prepare_sleep(
+			&xen_acpi_notify_hypervisor_state);
+}
+#else
+static inline void xen_acpi_sleep_register(void)
+{
+}
+#endif
+
 #endif	/* _XEN_ACPI_H */