Author: zbyniu Date: Wed May 14 18:51:00 2008 GMT
Module: SOURCES Tag: LINUX_2_6
---- Log message:
-
http://dev.gentoo.org/~spock/projects/fbcondecor/archive/fbcondecor-0.9.4-2.6.25-rc6.patch
---- Files affected:
SOURCES:
kernel-fbcondecor.patch (1.1.2.2 -> 1.1.2.3)
---- Diffs:
================================================================
Index: SOURCES/kernel-fbcondecor.patch
diff -u SOURCES/kernel-fbcondecor.patch:1.1.2.2
SOURCES/kernel-fbcondecor.patch:1.1.2.3
--- SOURCES/kernel-fbcondecor.patch:1.1.2.2 Thu Apr 24 12:18:43 2008
+++ SOURCES/kernel-fbcondecor.patch Wed May 14 20:50:54 2008
@@ -1,6 +1,6 @@
-diff -Naurp linux-orig/Documentation/fb/00-INDEX
linux-fbcondecor/Documentation/fb/00-INDEX
---- linux-orig/Documentation/fb/00-INDEX 2008-01-12 12:16:05.000000000
+0100
-+++ linux-fbcondecor/Documentation/fb/00-INDEX 2008-01-24 10:08:34.000000000
+0100
+diff -Naurp -x .git /tmp/linux/Documentation/fb/00-INDEX
./Documentation/fb/00-INDEX
+--- /tmp/linux/Documentation/fb/00-INDEX 2008-03-25 07:24:16.000000000
+0100
++++ ./Documentation/fb/00-INDEX 2008-03-25 23:04:10.000000000 +0100
@@ -17,6 +17,8 @@ deferred_io.txt
- an introduction to deferred IO.
fbcon.txt
@@ -10,9 +10,9 @@
framebuffer.txt
- introduction to frame buffer devices.
imacfb.txt
-diff -Naurp linux-orig/Documentation/fb/fbcondecor.txt
linux-fbcondecor/Documentation/fb/fbcondecor.txt
---- linux-orig/Documentation/fb/fbcondecor.txt 1970-01-01 01:00:00.000000000
+0100
-+++ linux-fbcondecor/Documentation/fb/fbcondecor.txt 2008-01-24
10:08:34.000000000 +0100
+diff -Naurp -x .git /tmp/linux/Documentation/fb/fbcondecor.txt
./Documentation/fb/fbcondecor.txt
+--- /tmp/linux/Documentation/fb/fbcondecor.txt 1970-01-01 01:00:00.000000000
+0100
++++ ./Documentation/fb/fbcondecor.txt 2008-03-25 23:04:10.000000000 +0100
@@ -0,0 +1,207 @@
+What is it?
+-----------
@@ -221,10 +221,10 @@
+Fbcondecor, fbcondecor protocol design, current implementation & docs by:
+ Michal Januszewski <[EMAIL PROTECTED]>
+
-diff -Naurp linux-orig/drivers/Makefile linux-fbcondecor/drivers/Makefile
---- linux-orig/drivers/Makefile 2008-01-12 12:16:05.000000000 +0100
-+++ linux-fbcondecor/drivers/Makefile 2008-01-24 10:08:34.000000000 +0100
-@@ -8,6 +8,9 @@
+diff -Naurp -x .git /tmp/linux/drivers/Makefile ./drivers/Makefile
+--- /tmp/linux/drivers/Makefile 2008-03-25 07:24:16.000000000 +0100
++++ ./drivers/Makefile 2008-03-25 23:04:10.000000000 +0100
+@@ -9,6 +9,9 @@ obj-$(CONFIG_HAVE_GPIO_LIB) += gpio/
obj-$(CONFIG_PCI) += pci/
obj-$(CONFIG_PARISC) += parisc/
obj-$(CONFIG_RAPIDIO) += rapidio/
@@ -234,7 +234,7 @@
obj-y += video/
obj-$(CONFIG_ACPI) += acpi/
# PnP must come after ACPI since it will eventually need to check if acpi
-@@ -17,10 +20,6 @@ obj-$(CONFIG_ARM_AMBA) += amba/
+@@ -18,10 +21,6 @@ obj-$(CONFIG_ARM_AMBA) += amba/
obj-$(CONFIG_XEN) += xen/
@@ -245,9 +245,9 @@
obj-$(CONFIG_CONNECTOR) += connector/
# i810fb and intelfb depend on char/agp/
-diff -Naurp linux-orig/drivers/video/console/bitblit.c
linux-fbcondecor/drivers/video/console/bitblit.c
---- linux-orig/drivers/video/console/bitblit.c 2008-01-12 12:16:05.000000000
+0100
-+++ linux-fbcondecor/drivers/video/console/bitblit.c 2008-01-24
10:08:34.000000000 +0100
+diff -Naurp -x .git /tmp/linux/drivers/video/console/bitblit.c
./drivers/video/console/bitblit.c
+--- /tmp/linux/drivers/video/console/bitblit.c 2008-03-25 07:24:16.000000000
+0100
++++ ./drivers/video/console/bitblit.c 2008-03-25 23:04:10.000000000 +0100
@@ -17,6 +17,7 @@
#include <linux/console.h>
#include <asm/types.h>
@@ -290,16 +290,16 @@
ops->cursor_reset = 0;
}
-diff -Naurp linux-orig/drivers/video/console/cfbcondecor.c
linux-fbcondecor/drivers/video/console/cfbcondecor.c
---- linux-orig/drivers/video/console/cfbcondecor.c 1970-01-01
01:00:00.000000000 +0100
-+++ linux-fbcondecor/drivers/video/console/cfbcondecor.c 2008-01-24
10:08:34.000000000 +0100
+diff -Naurp -x .git /tmp/linux/drivers/video/console/cfbcondecor.c
./drivers/video/console/cfbcondecor.c
+--- /tmp/linux/drivers/video/console/cfbcondecor.c 1970-01-01
01:00:00.000000000 +0100
++++ ./drivers/video/console/cfbcondecor.c 2008-03-25 23:11:30.000000000
+0100
@@ -0,0 +1,471 @@
+/*
+ * linux/drivers/video/cfbcon_decor.c -- Framebuffer decor render functions
-+ *
++ *
+ * Copyright (C) 2004 Michal Januszewski <[EMAIL PROTECTED]>
+ *
-+ * Code based upon "Bootdecor" (C) 2001-2003
++ * Code based upon "Bootdecor" (C) 2001-2003
+ * Volker Poplawski <[EMAIL PROTECTED]>,
+ * Stefan Reinauer <[EMAIL PROTECTED]>,
+ * Steffen Winterfeldt <[EMAIL PROTECTED]>,
@@ -309,7 +309,7 @@
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License. See the file COPYING in the main directory of this archive for
+ * more details.
-+ */
++ */
+#include <linux/module.h>
+#include <linux/types.h>
+#include <linux/fb.h>
@@ -336,26 +336,26 @@
+void fbcon_decor_fix_pseudo_pal(struct fb_info *info, struct vc_data *vc)
+{
+ int i, j, k;
-+ int minlen = min(min(info->var.red.length, info->var.green.length),
++ int minlen = min(min(info->var.red.length, info->var.green.length),
+ info->var.blue.length);
+ u32 col;
-+
++
+ for (j = i = 0; i < 16; i++) {
+ k = color_table[i];
-+
-+ col = ((vc->vc_palette[j++] >> (8-minlen))
++
++ col = ((vc->vc_palette[j++] >> (8-minlen))
+ << info->var.red.offset);
-+ col |= ((vc->vc_palette[j++] >> (8-minlen))
++ col |= ((vc->vc_palette[j++] >> (8-minlen))
+ << info->var.green.offset);
-+ col |= ((vc->vc_palette[j++] >> (8-minlen))
++ col |= ((vc->vc_palette[j++] >> (8-minlen))
+ << info->var.blue.offset);
+ ((u32 *)info->pseudo_palette)[k] = col;
+ }
+}
-+
-+void fbcon_decor_renderc(struct fb_info *info, int ypos, int xpos, int
height,
++
++void fbcon_decor_renderc(struct fb_info *info, int ypos, int xpos, int height,
+ int width, u8* src, u32 fgx, u32 bgx, u8 transparent)
-+{
++{
+ unsigned int x, y;
+ u32 dd;
+ int bytespp = ((info->var.bits_per_pixel + 7) >> 3);
@@ -368,10 +368,10 @@
+
+ if ((ypos + height) > info->var.yres || (xpos + width) > info->var.xres)
+ return;
-+
++
+ for (y = 0; y < height; y++) {
+ switch (info->var.bits_per_pixel) {
-+
++
+ case 32:
+ for (x = 0; x < width; x++) {
+
@@ -380,9 +380,9 @@
+ if (d & 0x80)
+ dd = fgx;
+ else
-+ dd = transparent ?
++ dd = transparent ?
+ *(u32 *)decor_src : bgx;
-+
++
+ d <<= 1;
+ decor_src += 4;
+ fb_writel(dd, dst);
@@ -397,9 +397,9 @@
+ if (d & 0x80)
+ dd = fgx;
+ else
-+ dd = transparent ?
++ dd = transparent ?
+ (*(u32 *)decor_src & 0xffffff) :
bgx;
-+
++
+ d <<= 1;
+ decor_src += 3;
+#ifdef __LITTLE_ENDIAN
@@ -416,7 +416,7 @@
+ break;
+ case 16:
+ for (x = 0; x < width; x += 2) {
-+ if ((x & 7) == 0)
++ if ((x & 7) == 0)
+ d = *src++;
+
+ parse_pixel(0, 2, u16);
@@ -436,12 +436,12 @@
+ for (x = 0; x < width; x += 4) {
+ if ((x & 7) == 0)
+ d = *src++;
-+
++
+ parse_pixel(0, 1, u8);
+ parse_pixel(1, 1, u8);
+ parse_pixel(2, 1, u8);
+ parse_pixel(3, 1, u8);
-+
++
+#ifdef __LITTLE_ENDIAN
+ dd = dd2[0] | (dd2[1] << 8) | (dd2[2] << 16) |
(dd2[3] << 24);
+#else
@@ -450,12 +450,12 @@
+ d <<= 4;
+ fb_writel(dd, dst);
+ dst += 4;
-+ }
++ }
+ }
+
+ dst += info->fix.line_length - width * bytespp;
+ decor_src += (info->var.xres - width) * bytespp;
-+ }
++ }
+}
+
+#define cc2cx(a) \
@@ -475,9 +475,9 @@
+
+ fg_color = get_color(vc, info, c, 1);
+ bg_color = get_color(vc, info, c, 0);
-+
++
+ /* Don't paint the background image if console is blanked */
-+ transparent = ops->blank_state ? 0 :
++ transparent = ops->blank_state ? 0 :
+ (vc->vc_decor.bg_color == bg_color);
+
+ xx = xx * vc->vc_font.width + vc->vc_decor.tx;
@@ -491,7 +491,7 @@
+ src = vc->vc_font.data + (c & charmask) * vc->vc_font.height *
+ ((vc->vc_font.width + 7) >> 3);
+
-+ fbcon_decor_renderc(info, yy, xx, vc->vc_font.height,
++ fbcon_decor_renderc(info, yy, xx, vc->vc_font.height,
+ vc->vc_font.width, src, fgx, bgx, transparent);
+ xx += vc->vc_font.width;
+ }
@@ -502,7 +502,7 @@
+ int i;
+ unsigned int dsize, s_pitch;
+ struct fbcon_ops *ops = info->fbcon_par;
-+ struct vc_data* vc;
++ struct vc_data* vc;
+ u8 *src;
+
+ /* we really don't need any cursors while the console is blanked */
@@ -517,7 +517,7 @@
+
+ s_pitch = (cursor->image.width + 7) >> 3;
+ dsize = s_pitch * cursor->image.height;
-+ if (cursor->enable) {
++ if (cursor->enable) {
+ switch (cursor->rop) {
+ case ROP_XOR:
+ for (i = 0; i < dsize; i++)
@@ -545,27 +545,27 @@
+ kfree(src);
+}
+
-+static void decorset(u8 *dst, int height, int width, int dstbytes,
++static void decorset(u8 *dst, int height, int width, int dstbytes,
+ u32 bgx, int bpp)
+{
+ int i;
-+
++
+ if (bpp == 8)
+ bgx |= bgx << 8;
+ if (bpp == 16 || bpp == 8)
+ bgx |= bgx << 16;
-+
++
+ while (height-- > 0) {
+ u8 *p = dst;
-+
++
+ switch (bpp) {
-+
++
+ case 32:
+ for (i=0; i < width; i++) {
+ fb_writel(bgx, p); p += 4;
+ }
+ break;
-+ case 24:
++ case 24:
+ for (i=0; i < width; i++) {
+#ifdef __LITTLE_ENDIAN
+ fb_writew((bgx & 0xffff),(u16*)p); p += 2;
@@ -590,7 +590,7 @@
+ for (i=0; i < width/4; i++) {
+ fb_writel(bgx,p); p += 4;
+ }
-+
++
+ if (width & 2) {
+ fb_writew(bgx,p); p += 2;
+ }
@@ -598,12 +598,12 @@
+ fb_writeb(bgx,(u8*)p);
+ break;
+
-+ }
++ }
+ dst += dstbytes;
+ }
+}
+
-+void fbcon_decor_copy(u8 *dst, u8 *src, int height, int width, int linebytes,
++void fbcon_decor_copy(u8 *dst, u8 *src, int height, int width, int linebytes,
+ int srclinebytes, int bpp)
+{
+ int i;
@@ -613,12 +613,12 @@
+ u32 *q = (u32 *)src;
+
+ switch (bpp) {
-+
++
+ case 32:
+ for (i=0; i < width; i++)
+ fb_writel(*q++, p++);
-+ break;
-+ case 24:
++ break;
++ case 24:
+ for (i=0; i < (width*3/4); i++)
+ fb_writel(*q++, p++);
+ if ((width*3) % 4) {
@@ -641,11 +641,11 @@
+ fb_writew(*(u16*)q, (u16*)p);
+ break;
+ case 8:
-+ for (i=0; i < width/4; i++)
++ for (i=0; i < width/4; i++)
+ fb_writel(*q++, p++);
-+
++
+ if (width & 2) {
-+ fb_writew(*(u16*)q, (u16*)p);
++ fb_writew(*(u16*)q, (u16*)p);
+ q = (u32*) ((u16*)q + 1);
+ p = (u32*) ((u16*)p + 1);
+ }
@@ -659,8 +659,8 @@
+ }
+}
+
-+static void decorfill(struct fb_info *info, int sy, int sx, int height,
-+ int width)
++static void decorfill(struct fb_info *info, int sy, int sx, int height,
++ int width)
+{
+ int bytespp = ((info->var.bits_per_pixel + 7) >> 3);
+ int d = sy * info->fix.line_length + sx * bytespp;
@@ -671,15 +671,15 @@
+ info->var.bits_per_pixel);
+}
+
-+void fbcon_decor_clear(struct vc_data *vc, struct fb_info *info, int sy, int
sx,
++void fbcon_decor_clear(struct vc_data *vc, struct fb_info *info, int sy, int
sx,
+ int height, int width)
+{
+ int bgshift = (vc->vc_hi_font_mask) ? 13 : 12;
-+ int bg_color = attr_bgcol_ec(bgshift, vc);
-+ int transparent = vc->vc_decor.bg_color == bg_color;
+ struct fbcon_ops *ops = info->fbcon_par;
+ u8 *dst;
++ int transparent, bg_color = attr_bgcol_ec(bgshift, vc, info);
+
++ transparent = (vc->vc_decor.bg_color == bg_color);
+ sy = sy * vc->vc_font.height + vc->vc_decor.ty;
+ sx = sx * vc->vc_font.width + vc->vc_decor.tx;
+ height *= vc->vc_font.height;
@@ -689,14 +689,14 @@
+ if (transparent && !ops->blank_state) {
+ decorfill(info, sy, sx, height, width);
+ } else {
-+ dst = (u8 *)(info->screen_base + sy * info->fix.line_length +
++ dst = (u8 *)(info->screen_base + sy * info->fix.line_length +
+ sx * ((info->var.bits_per_pixel + 7) >> 3));
-+ decorset(dst, height, width, info->fix.line_length,
cc2cx(bg_color),
++ decorset(dst, height, width, info->fix.line_length,
cc2cx(bg_color),
+ info->var.bits_per_pixel);
+ }
+}
+
-+void fbcon_decor_clear_margins(struct vc_data *vc, struct fb_info *info,
++void fbcon_decor_clear_margins(struct vc_data *vc, struct fb_info *info,
+ int bottom_only)
+{
+ unsigned int tw = vc->vc_cols*vc->vc_font.width;
@@ -765,9 +765,9 @@
+ }
+}
+
-diff -Naurp linux-orig/drivers/video/console/fbcon.c
linux-fbcondecor/drivers/video/console/fbcon.c
---- linux-orig/drivers/video/console/fbcon.c 2008-01-12 12:16:05.000000000
+0100
-+++ linux-fbcondecor/drivers/video/console/fbcon.c 2008-01-24
10:08:34.000000000 +0100
+diff -Naurp -x .git /tmp/linux/drivers/video/console/fbcon.c
./drivers/video/console/fbcon.c
+--- /tmp/linux/drivers/video/console/fbcon.c 2008-03-25 07:24:16.000000000
+0100
++++ ./drivers/video/console/fbcon.c 2008-03-25 23:04:10.000000000 +0100
@@ -90,6 +90,7 @@
#endif
@@ -794,7 +794,7 @@
u16 c, int is_fg)
{
int depth = fb_get_color_depth(&info->var, &info->fix);
-@@ -423,6 +424,7 @@ static void fb_flashcursor(struct work_s
+@@ -420,6 +421,7 @@ static void fb_flashcursor(struct work_s
CM_ERASE : CM_DRAW;
ops->cursor(vc, info, mode, softback_lines, get_color(vc, info, c, 1),
get_color(vc, info, c, 0));
@@ -802,7 +802,7 @@
release_console_sem();
}
-@@ -593,6 +595,8 @@ static int fbcon_takeover(int show_logo)
+@@ -590,6 +592,8 @@ static int fbcon_takeover(int show_logo)
info_idx = -1;
}
@@ -811,7 +811,7 @@
return err;
}
-@@ -1034,6 +1038,12 @@ static const char *fbcon_startup(void)
+@@ -1031,6 +1035,12 @@ static const char *fbcon_startup(void)
rows = FBCON_SWAP(ops->rotate, info->var.yres, info->var.xres);
cols /= vc->vc_font.width;
rows /= vc->vc_font.height;
@@ -824,7 +824,7 @@
vc_resize(vc, cols, rows);
DPRINTK("mode: %s\n", info->fix.id);
-@@ -1117,7 +1127,7 @@ static void fbcon_init(struct vc_data *v
+@@ -1114,7 +1124,7 @@ static void fbcon_init(struct vc_data *v
cap = info->flags;
if (vc != svc || logo_shown == FBCON_LOGO_DONTSHOW ||
@@ -833,7 +833,7 @@
logo = 0;
if (var_to_display(p, &info->var, info))
-@@ -1316,6 +1326,11 @@ static void fbcon_clear(struct vc_data *
+@@ -1313,6 +1323,11 @@ static void fbcon_clear(struct vc_data *
if (!height || !width)
return;
@@ -845,7 +845,7 @@
/* Split blits that cross physical y_wrap boundary */
y_break = p->vrows - p->yscroll;
-@@ -1335,10 +1350,15 @@ static void fbcon_putcs(struct vc_data *
+@@ -1332,10 +1347,15 @@ static void fbcon_putcs(struct vc_data *
struct display *p = &fb_display[vc->vc_num];
struct fbcon_ops *ops = info->fbcon_par;
@@ -865,7 +865,7 @@
}
static void fbcon_putc(struct vc_data *vc, int c, int ypos, int xpos)
-@@ -1354,8 +1374,13 @@ static void fbcon_clear_margins(struct v
+@@ -1351,8 +1371,13 @@ static void fbcon_clear_margins(struct v
struct fb_info *info = registered_fb[con2fb_map[vc->vc_num]];
struct fbcon_ops *ops = info->fbcon_par;
@@ -881,7 +881,7 @@
}
static void fbcon_cursor(struct vc_data *vc, int mode)
-@@ -1875,7 +1900,7 @@ static int fbcon_scroll(struct vc_data *
+@@ -1872,7 +1897,7 @@ static int fbcon_scroll(struct vc_data *
count = vc->vc_rows;
if (softback_top)
fbcon_softback_note(vc, t, count);
@@ -890,7 +890,7 @@
goto redraw_up;
switch (p->scrollmode) {
case SCROLL_MOVE:
-@@ -1968,6 +1993,8 @@ static int fbcon_scroll(struct vc_data *
+@@ -1965,6 +1990,8 @@ static int fbcon_scroll(struct vc_data *
count = vc->vc_rows;
if (logo_shown >= 0)
goto redraw_down;
@@ -899,7 +899,7 @@
switch (p->scrollmode) {
case SCROLL_MOVE:
fbcon_redraw_blit(vc, info, p, b - 1, b - t - count,
-@@ -2116,6 +2143,13 @@ static void fbcon_bmove_rec(struct vc_da
+@@ -2113,6 +2140,13 @@ static void fbcon_bmove_rec(struct vc_da
}
return;
}
@@ -913,7 +913,7 @@
ops->bmove(vc, info, real_y(p, sy), sx, real_y(p, dy), dx,
height, width);
}
-@@ -2186,8 +2220,8 @@ static int fbcon_resize(struct vc_data *
+@@ -2183,8 +2217,8 @@ static int fbcon_resize(struct vc_data *
var.yres = virt_h * virt_fh;
x_diff = info->var.xres - var.xres;
y_diff = info->var.yres - var.yres;
@@ -924,7 +924,7 @@
const struct fb_videomode *mode;
DPRINTK("attempting resize %ix%i\n", var.xres, var.yres);
-@@ -2223,6 +2257,19 @@ static int fbcon_switch(struct vc_data *
+@@ -2220,6 +2254,19 @@ static int fbcon_switch(struct vc_data *
info = registered_fb[con2fb_map[vc->vc_num]];
ops = info->fbcon_par;
@@ -944,7 +944,7 @@
if (softback_top) {
if (softback_lines)
-@@ -2241,9 +2288,6 @@ static int fbcon_switch(struct vc_data *
+@@ -2238,9 +2285,6 @@ static int fbcon_switch(struct vc_data *
logo_shown = FBCON_LOGO_CANSHOW;
}
@@ -954,7 +954,7 @@
/*
* FIXME: If we have multiple fbdev's loaded, we need to
* update all info->currcon. Perhaps, we can place this
-@@ -2283,6 +2327,18 @@ static int fbcon_switch(struct vc_data *
+@@ -2280,6 +2324,18 @@ static int fbcon_switch(struct vc_data *
fbcon_del_cursor_timer(old_info);
}
@@ -973,7 +973,7 @@
if (fbcon_is_inactive(vc, info) ||
ops->blank_state != FB_BLANK_UNBLANK)
fbcon_del_cursor_timer(info);
-@@ -2397,8 +2453,12 @@ static int fbcon_blank(struct vc_data *v
+@@ -2394,8 +2450,12 @@ static int fbcon_blank(struct vc_data *v
fbcon_cursor(vc, blank ? CM_ERASE : CM_DRAW);
ops->cursor_flash = (!blank);
@@ -988,7 +988,7 @@
}
if (!blank)
-@@ -2549,13 +2609,22 @@ static int fbcon_do_set_font(struct vc_d
+@@ -2546,13 +2606,22 @@ static int fbcon_do_set_font(struct vc_d
}
if (resize) {
@@ -1011,7 +1011,7 @@
if (CON_IS_VISIBLE(vc) && softback_buf)
fbcon_update_softback(vc);
} else if (CON_IS_VISIBLE(vc)
-@@ -2684,7 +2753,7 @@ static int fbcon_set_palette(struct vc_d
+@@ -2681,7 +2750,7 @@ static int fbcon_set_palette(struct vc_d
int i, j, k, depth;
u8 val;
@@ -1020,7 +1020,7 @@
return -EINVAL;
if (!CON_IS_VISIBLE(vc))
-@@ -2710,7 +2779,49 @@ static int fbcon_set_palette(struct vc_d
+@@ -2707,7 +2776,49 @@ static int fbcon_set_palette(struct vc_d
} else
fb_copy_cmap(fb_default_cmap(1 << depth), &palette_cmap);
@@ -1071,7 +1071,7 @@
}
static u16 *fbcon_screen_pos(struct vc_data *vc, int offset)
-@@ -2936,7 +3047,14 @@ static void fbcon_modechanged(struct fb_
+@@ -2933,7 +3044,14 @@ static void fbcon_modechanged(struct fb_
rows = FBCON_SWAP(ops->rotate, info->var.yres, info->var.xres);
cols /= vc->vc_font.width;
rows /= vc->vc_font.height;
@@ -1087,7 +1087,7 @@
updatescrollmode(p, info, vc);
scrollback_max = 0;
scrollback_current = 0;
-@@ -3564,6 +3682,7 @@ static void fbcon_exit(void)
+@@ -3561,6 +3679,7 @@ static void fbcon_exit(void)
}
}
@@ -1095,9 +1095,9 @@
fbcon_has_exited = 1;
}
-diff -Naurp linux-orig/drivers/video/console/fbcondecor.c
linux-fbcondecor/drivers/video/console/fbcondecor.c
---- linux-orig/drivers/video/console/fbcondecor.c 1970-01-01
01:00:00.000000000 +0100
-+++ linux-fbcondecor/drivers/video/console/fbcondecor.c 2008-01-24
10:08:34.000000000 +0100
+diff -Naurp -x .git /tmp/linux/drivers/video/console/fbcondecor.c
./drivers/video/console/fbcondecor.c
+--- /tmp/linux/drivers/video/console/fbcondecor.c 1970-01-01
01:00:00.000000000 +0100
++++ ./drivers/video/console/fbcondecor.c 2008-03-25 23:04:10.000000000
+0100
@@ -0,0 +1,420 @@
+/*
+ * linux/drivers/video/console/fbcondecor.c -- Framebuffer console
decorations
@@ -1519,9 +1519,9 @@
+}
+
+EXPORT_SYMBOL(fbcon_decor_path);
-diff -Naurp linux-orig/drivers/video/console/fbcondecor.h
linux-fbcondecor/drivers/video/console/fbcondecor.h
---- linux-orig/drivers/video/console/fbcondecor.h 1970-01-01
01:00:00.000000000 +0100
-+++ linux-fbcondecor/drivers/video/console/fbcondecor.h 2008-01-24
10:08:34.000000000 +0100
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/kernel-fbcondecor.patch?r1=1.1.2.2&r2=1.1.2.3&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
