1 files changed, 1 insertions, 47 deletions

diff --git a/arch/alpha/include/asm/console.h b/arch/alpha/include/asm/console.h
index a3ce4e62249b..f2b584fe0994 100644
--- a/arch/alpha/include/asm/console.h
+++ b/arch/alpha/include/asm/console.h
@@ -1,52 +1,8 @@
 #ifndef __AXP_CONSOLE_H
 #define __AXP_CONSOLE_H
 
-/*
- * Console callback routine numbers
- */
-#define CCB_GETC                0x01
-#define CCB_PUTS                0x02
-#define CCB_RESET_TERM          0x03
-#define CCB_SET_TERM_INT        0x04
-#define CCB_SET_TERM_CTL        0x05
-#define CCB_PROCESS_KEYCODE     0x06
-#define CCB_OPEN_CONSOLE        0x07
-#define CCB_CLOSE_CONSOLE       0x08
+#include <uapi/asm/console.h>
 
-#define CCB_OPEN                0x10
-#define CCB_CLOSE               0x11
-#define CCB_IOCTL               0x12
-#define CCB_READ                0x13
-#define CCB_WRITE               0x14
-
-#define CCB_SET_ENV             0x20
-#define CCB_RESET_ENV           0x21
-#define CCB_GET_ENV             0x22
-#define CCB_SAVE_ENV            0x23
-
-#define CCB_PSWITCH             0x30
-#define CCB_BIOS_EMUL           0x32
-
-/*
- * Environment variable numbers
- */
-#define ENV_AUTO_ACTION         0x01
-#define ENV_BOOT_DEV            0x02
-#define ENV_BOOTDEF_DEV         0x03
-#define ENV_BOOTED_DEV          0x04
-#define ENV_BOOT_FILE           0x05
-#define ENV_BOOTED_FILE         0x06
-#define ENV_BOOT_OSFLAGS        0x07
-#define ENV_BOOTED_OSFLAGS      0x08
-#define ENV_BOOT_RESET          0x09
-#define ENV_DUMP_DEV            0x0A
-#define ENV_ENABLE_AUDIT        0x0B
-#define ENV_LICENSE             0x0C
-#define ENV_CHAR_SET            0x0D
-#define ENV_LANGUAGE            0x0E
-#define ENV_TTY_DEV             0x0F
-
-#ifdef __KERNEL__
 #ifndef __ASSEMBLY__
 extern long callback_puts(long unit, const char *s, long length);
 extern long callback_getc(long unit);
@@ -70,6 +26,4 @@ struct hwrpb_struct;
 extern int callback_init_done;
 extern void * callback_init(void *);
 #endif /* __ASSEMBLY__ */
-#endif /* __KERNEL__ */
-
 #endif /* __AXP_CONSOLE_H */