| 1 |
Author: mpagano |
| 2 |
Date: 2012-10-02 16:52:28 +0000 (Tue, 02 Oct 2012) |
| 3 |
New Revision: 2210 |
| 4 |
|
| 5 |
Modified: |
| 6 |
genpatches-2.6/trunk/3.6/4200_fbcondecor-0.9.6.patch |
| 7 |
Log: |
| 8 |
Minor fix for fbcondecor patch |
| 9 |
|
| 10 |
Modified: genpatches-2.6/trunk/3.6/4200_fbcondecor-0.9.6.patch |
| 11 |
=================================================================== |
| 12 |
--- genpatches-2.6/trunk/3.6/4200_fbcondecor-0.9.6.patch 2012-10-01 22:44:05 UTC (rev 2209) |
| 13 |
+++ genpatches-2.6/trunk/3.6/4200_fbcondecor-0.9.6.patch 2012-10-02 16:52:28 UTC (rev 2210) |
| 14 |
@@ -1,34 +1,3 @@ |
| 15 |
-From ea952aef0760671b656a971f0716c0aa9c918b19 Mon Sep 17 00:00:00 2001 |
| 16 |
-From: Alexey Shvetsov <alexxy@g.o> |
| 17 |
-Date: Mon, 2 Apr 2012 16:54:49 +0400 |
| 18 |
-Subject: [PATCH] fbcondecor |
| 19 |
- |
| 20 |
-Signed-off-by: Alexey Shvetsov <alexxy@g.o> |
| 21 |
---- |
| 22 |
- Documentation/fb/00-INDEX | 2 + |
| 23 |
- Documentation/fb/fbcondecor.txt | 207 +++++++++++++ |
| 24 |
- drivers/Makefile | 9 +- |
| 25 |
- drivers/video/Kconfig | 1 - |
| 26 |
- drivers/video/console/Kconfig | 13 + |
| 27 |
- drivers/video/console/Makefile | 1 + |
| 28 |
- drivers/video/console/bitblit.c | 20 +- |
| 29 |
- drivers/video/console/cfbcondecor.c | 471 +++++++++++++++++++++++++++++ |
| 30 |
- drivers/video/console/fbcon.c | 213 +++++++++++--- |
| 31 |
- drivers/video/console/fbcondecor.c | 555 +++++++++++++++++++++++++++++++++++ |
| 32 |
- drivers/video/console/fbcondecor.h | 78 +++++ |
| 33 |
- drivers/video/fbcmap.c | 11 +- |
| 34 |
- drivers/video/fbmem.c | 9 - |
| 35 |
- include/linux/console_decor.h | 46 +++ |
| 36 |
- include/linux/console_struct.h | 3 + |
| 37 |
- include/linux/fb.h | 90 ++++++ |
| 38 |
- kernel/sysctl.c | 33 ++- |
| 39 |
- 17 files changed, 1687 insertions(+), 75 deletions(-) |
| 40 |
- create mode 100644 Documentation/fb/fbcondecor.txt |
| 41 |
- create mode 100644 drivers/video/console/cfbcondecor.c |
| 42 |
- create mode 100644 drivers/video/console/fbcondecor.c |
| 43 |
- create mode 100644 drivers/video/console/fbcondecor.h |
| 44 |
- create mode 100644 include/linux/console_decor.h |
| 45 |
- |
| 46 |
diff --git a/Documentation/fb/00-INDEX b/Documentation/fb/00-INDEX |
| 47 |
index 30a7054..9b6a733 100644 |
| 48 |
--- a/Documentation/fb/00-INDEX |
| 49 |
@@ -901,15 +870,6 @@ |
| 50 |
u16 c, int is_fg) |
| 51 |
{ |
| 52 |
int depth = fb_get_color_depth(&info->var, &info->fix); |
| 53 |
-@@ -443,7 +444,7 @@ static int __init fb_console_setup(char *this_opt) |
| 54 |
- while ((options = strsep(&this_opt, ",")) != NULL) { |
| 55 |
- if (!strncmp(options, "font:", 5)) |
| 56 |
- strcpy(fontname, options + 5); |
| 57 |
-- |
| 58 |
-+ |
| 59 |
- if (!strncmp(options, "scrollback:", 11)) { |
| 60 |
- options += 11; |
| 61 |
- if (*options) { |
| 62 |
@@ -458,7 +459,7 @@ static int __init fb_console_setup(char *this_opt) |
| 63 |
} else |
| 64 |
return 1; |
Archives