summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-07-08 09:43:01 +0200
committerIngo Molnar <mingo@elte.hu>2008-07-08 09:43:01 +0200
commit3c1ca43fafea41e38cb2d0c1684119af4c1de547 (patch)
tree122e41a7b9fca26ea25ea9864180f5016274a8c8 /include
parent6924d1ab8b7bbe5ab416713f5701b3316b2df85b (diff)
parent6bcb13b35a2ea39be6c7cc0292b8ad1191b1a748 (diff)
downloadtalos-op-linux-3c1ca43fafea41e38cb2d0c1684119af4c1de547.tar.gz
talos-op-linux-3c1ca43fafea41e38cb2d0c1684119af4c1de547.zip
Merge branch 'x86/setup' into x86/devel
Diffstat (limited to 'include')
-rw-r--r--include/asm-x86/bootparam.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/asm-x86/bootparam.h b/include/asm-x86/bootparam.h
index f62f4733606b..3e36ba8f288b 100644
--- a/include/asm-x86/bootparam.h
+++ b/include/asm-x86/bootparam.h
@@ -40,6 +40,7 @@ struct setup_header {
__u8 type_of_loader;
__u8 loadflags;
#define LOADED_HIGH (1<<0)
+#define QUIET_FLAG (1<<5)
#define KEEP_SEGMENTS (1<<6)
#define CAN_USE_HEAP (1<<7)
__u16 setup_move_size;
OpenPOWER on IntegriCloud