Merge branch 'fixes-jgarzik' of git://git.kernel.org/pub/scm/linux/kernel/git/linvill...

[linux-2.6] / include / asm-x86 / bootparam.h

diff --git a/include/asm-x86/bootparam.h b/include/asm-x86/bootparam.h
index b91b01783e4ba6247b020dde839842f49f22c650..ef67b59dbdb93ea61215628ab615d78d67f5f2d9 100644 (file)
--- a/include/asm-x86/bootparam.h
+++ b/include/asm-x86/bootparam.h
@@ -14,6 +14,9 @@ struct setup_header {
        u16     root_flags;
        u32     syssize;
        u16     ram_size;
+#define RAMDISK_IMAGE_START_MASK       0x07FF
+#define RAMDISK_PROMPT_FLAG            0x8000
+#define RAMDISK_LOAD_FLAG              0x4000
        u16     vid_mode;
        u16     root_dev;
        u16     boot_flag;