diff options
| author | Joshua Cov | 2012-04-13 21:08:26 +0200 |
|---|---|---|
| committer | H. Peter Anvin | 2012-05-08 23:19:41 +0200 |
| commit | b2d0b7a061bfddd27155c7dcd53f365d9dc0c7c3 (patch) | |
| tree | 8063c6df479723b7adc509ee2aad728889faa9a4 /arch/x86/include/asm/bootparam.h | |
| parent | x86/olpc/xo1/sci: Report RTC wakeup events (diff) | |
| download | kernel-qcow2-linux-b2d0b7a061bfddd27155c7dcd53f365d9dc0c7c3.tar.gz kernel-qcow2-linux-b2d0b7a061bfddd27155c7dcd53f365d9dc0c7c3.tar.xz kernel-qcow2-linux-b2d0b7a061bfddd27155c7dcd53f365d9dc0c7c3.zip | |
keyboard: Use BIOS Keyboard variable to set Numlock
The PC BIOS does provide a NUMLOCK flag containing the desired state
of this LED. This patch sets the current state according to the data
in the bios.
[ hpa: fixed __weak declaration without definition, changed "inline"
to "static inline" ]
Signed-Off-By: Joshua Cov <joshuacov@googlemail.com>
Link: http://lkml.kernel.org/r/CAKL7Q7rvq87TNS1T_Km8fW_5OzS%2BSbYazLXKxW-6ztOxo3zorg@mail.gmail.com
Acked-by: Alan Cox <alan@lxorguk.ukuu.org.uk>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'arch/x86/include/asm/bootparam.h')
| -rw-r--r-- | arch/x86/include/asm/bootparam.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/x86/include/asm/bootparam.h b/arch/x86/include/asm/bootparam.h index 2f90c51cc49d..eb45aa6b1f27 100644 --- a/arch/x86/include/asm/bootparam.h +++ b/arch/x86/include/asm/bootparam.h @@ -112,7 +112,8 @@ struct boot_params { __u8 e820_entries; /* 0x1e8 */ __u8 eddbuf_entries; /* 0x1e9 */ __u8 edd_mbr_sig_buf_entries; /* 0x1ea */ - __u8 _pad6[6]; /* 0x1eb */ + __u8 kbd_status; /* 0x1eb */ + __u8 _pad6[5]; /* 0x1ec */ struct setup_header hdr; /* setup header */ /* 0x1f1 */ __u8 _pad7[0x290-0x1f1-sizeof(struct setup_header)]; __u32 edd_mbr_sig_buffer[EDD_MBR_SIG_MAX]; /* 0x290 */ |