lcd: add devm_lcd_device_{register,unregister}()

[linux-2.6-block.git] / include / linux / reboot.h

diff --git a/include/linux/reboot.h b/include/linux/reboot.h
index e0879a70e830e29847cc9ba9b9f4d6851d8e3c4d..23b36304cd881bb77bfb0ca092b0e4346b88d87d 100644 (file)
--- a/include/linux/reboot.h
+++ b/include/linux/reboot.h
@@ -1,43 +1,9 @@
 #ifndef _LINUX_REBOOT_H
 #define _LINUX_REBOOT_H
 
-/*
- * Magic values required to use _reboot() system call.
- */
-
-#define        LINUX_REBOOT_MAGIC1     0xfee1dead
-#define        LINUX_REBOOT_MAGIC2     672274793
-#define        LINUX_REBOOT_MAGIC2A    85072278
-#define        LINUX_REBOOT_MAGIC2B    369367448
-#define        LINUX_REBOOT_MAGIC2C    537993216
-
-
-/*
- * Commands accepted by the _reboot() system call.
- *
- * RESTART     Restart system using default command and mode.
- * HALT        Stop OS and give system control to ROM monitor, if any.
- * CAD_ON      Ctrl-Alt-Del sequence causes RESTART command.
- * CAD_OFF     Ctrl-Alt-Del sequence sends SIGINT to init task.
- * POWER_OFF   Stop OS and remove all power from system, if possible.
- * RESTART2    Restart system using given command string.
- * SW_SUSPEND  Suspend system using software suspend if compiled in.
- * KEXEC       Restart system using a previously loaded Linux kernel
- */
-
-#define        LINUX_REBOOT_CMD_RESTART        0x01234567
-#define        LINUX_REBOOT_CMD_HALT           0xCDEF0123
-#define        LINUX_REBOOT_CMD_CAD_ON         0x89ABCDEF
-#define        LINUX_REBOOT_CMD_CAD_OFF        0x00000000
-#define        LINUX_REBOOT_CMD_POWER_OFF      0x4321FEDC
-#define        LINUX_REBOOT_CMD_RESTART2       0xA1B2C3D4
-#define        LINUX_REBOOT_CMD_SW_SUSPEND     0xD000FCE2
-#define        LINUX_REBOOT_CMD_KEXEC          0x45584543
-
-
-#ifdef __KERNEL__
 
 #include <linux/notifier.h>
+#include <uapi/linux/reboot.h>
 
 #define SYS_DOWN       0x0001  /* Notify of system down */
 #define SYS_RESTART    SYS_DOWN
@@ -84,6 +50,4 @@ extern int orderly_poweroff(bool force);
 extern void emergency_restart(void);
 #include <asm/emergency-restart.h>
 
-#endif
-
 #endif /* _LINUX_REBOOT_H */