diff options
| author | Ingo Molnar <mingo@kernel.org> | 2012-09-19 11:04:17 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2012-09-19 11:04:17 -0400 |
| commit | 984ff8a4d2251fbd09b1e8515133bdfe9ef4bcd6 (patch) | |
| tree | e1dfee938d280d0bd6130cb6489ae1f5faf38631 /include | |
| parent | 925a6f0bf8bd122d5d2429af7f0ca0fecf4ae71f (diff) | |
| parent | e9b10953edbccd3744e039ffc060ab2692f17856 (diff) | |
Merge branch 'x86/efi/for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfleming/linux into x86/efi
Pull misc EFI fixlets from Matt Fleming.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/screen_info.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/screen_info.h b/include/linux/screen_info.h index 899fbb487c94..fb3c5a8fef3d 100644 --- a/include/linux/screen_info.h +++ b/include/linux/screen_info.h | |||
| @@ -68,6 +68,8 @@ struct screen_info { | |||
| 68 | 68 | ||
| 69 | #define VIDEO_FLAGS_NOCURSOR (1 << 0) /* The video mode has no cursor set */ | 69 | #define VIDEO_FLAGS_NOCURSOR (1 << 0) /* The video mode has no cursor set */ |
| 70 | 70 | ||
| 71 | #define VIDEO_CAPABILITY_SKIP_QUIRKS (1 << 0) | ||
| 72 | |||
| 71 | #ifdef __KERNEL__ | 73 | #ifdef __KERNEL__ |
| 72 | extern struct screen_info screen_info; | 74 | extern struct screen_info screen_info; |
| 73 | 75 | ||