diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-10 16:29:28 +0100 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-10 16:29:28 +0100 |
commit | 39aef29414d77492e06d872cfeaf4ba744fa9d38 (patch) | |
tree | 708ee5f6f46f5bd2db6c4ec1cce2a1922df4076a /target/linux/patches/3.13.6/vga-cons-default-off.patch | |
parent | ed3d91cf2dfc6f63ae749b54c7d718eb73dd6211 (diff) | |
parent | 6e58f05aaae4943de494bc30dd3bf184a6d676f2 (diff) |
resolve conflict
Diffstat (limited to 'target/linux/patches/3.13.6/vga-cons-default-off.patch')
-rw-r--r-- | target/linux/patches/3.13.6/vga-cons-default-off.patch | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/target/linux/patches/3.13.6/vga-cons-default-off.patch b/target/linux/patches/3.13.6/vga-cons-default-off.patch new file mode 100644 index 000000000..08a57f783 --- /dev/null +++ b/target/linux/patches/3.13.6/vga-cons-default-off.patch @@ -0,0 +1,12 @@ +diff -Nur linux-3.11.5.orig/drivers/video/console/Kconfig linux-3.11.5/drivers/video/console/Kconfig +--- linux-3.11.5.orig/drivers/video/console/Kconfig 2013-10-14 03:14:45.000000000 +0200 ++++ linux-3.11.5/drivers/video/console/Kconfig 2013-10-16 18:04:45.000000000 +0200 +@@ -9,7 +9,7 @@ + depends on !4xx && !8xx && !SPARC && !M68K && !PARISC && !FRV && \ + !SUPERH && !BLACKFIN && !AVR32 && !MN10300 && !CRIS && \ + (!ARM || ARCH_FOOTBRIDGE || ARCH_INTEGRATOR || ARCH_NETWINDER) +- default y ++ default n + help + Saying Y here will allow you to use Linux in text mode through a + display that complies with the generic VGA standard. Virtually |