diff options
| author | David Herrmann <dh.herrmann@gmail.com> | 2014-01-23 10:57:58 +0100 |
|---|---|---|
| committer | David Herrmann <dh.herrmann@gmail.com> | 2014-01-23 13:55:49 +0100 |
| commit | 70c57b30c26cd9f821e9c11cc3a0968a9b470b07 (patch) | |
| tree | 1aec0b6bc01939b867c4bcdd6a402094f459a15e | |
| parent | 0490585888b390d47c8a04dfad70d6248d5a062e (diff) | |
x86/sysfb: allow sysfb+simpledrm combinationsimpledrm
We used to protect X86_SYSFB by depending on FB_SIMPLE so users don't
accidentally end up without a kernel console. Now that DRM_SIMPLEDRM also
provides a simple-framebuffer driver, we can whitelist this driver, too.
| -rw-r--r-- | arch/x86/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 93df43983d26..f3eae6a3f779 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -2299,7 +2299,7 @@ source "drivers/rapidio/Kconfig" config X86_SYSFB bool "Mark VGA/VBE/EFI FB as generic system framebuffer" - depends on FB_SIMPLE + depends on FB_SIMPLE || DRM_SIMPLEDRM select SYSFB help Firmwares often provide initial graphics framebuffers so the BIOS, |