The patch titled tdfxfb: fix frame buffer name overrun has been removed from the -mm tree. Its filename was tdfxfb-fix-frame-buffer-name-overrun.patch This patch was dropped because an updated version will be merged The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: tdfxfb: fix frame buffer name overrun From: Krzysztof Helt <krzysztof.h1@xxxxx> If there are more then one graphics card handled by the tdfxfb driver the name of the frame buffer overruns reserved name size. Signed-off-by: Krzysztof Helt <krzysztof.h1@xxxxx> Cc: Geert Uytterhoeven <geert@xxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/video/tdfxfb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff -puN drivers/video/tdfxfb.c~tdfxfb-fix-frame-buffer-name-overrun drivers/video/tdfxfb.c --- a/drivers/video/tdfxfb.c~tdfxfb-fix-frame-buffer-name-overrun +++ a/drivers/video/tdfxfb.c @@ -95,7 +95,6 @@ static inline int mtrr_del(int reg, unsi #define VOODOO5_MAX_PIXCLOCK 350000 static struct fb_fix_screeninfo tdfx_fix __devinitdata = { - .id = "3Dfx", .type = FB_TYPE_PACKED_PIXELS, .visual = FB_VISUAL_PSEUDOCOLOR, .ypanstep = 1, @@ -1196,6 +1195,7 @@ static int __devinit tdfxfb_probe(struct return -ENOMEM; default_par = info->par; + strcpy(tdfx_fix.id, "3Dfx"); /* Configure the default fb_fix_screeninfo first */ switch (pdev->device) { _ Patches currently in -mm which might be from krzysztof.h1@xxxxx are cirrusfb-check_par-fixes.patch tdfxfb-fix-sdram-memory-size-detection.patch tdfxfb-fix-frame-buffer-name-overrun.patch linux-next.patch fb-metronome-printk-format-warning.patch rtc-m48t59-reduce-structure-m48t59_private.patch rtc-m48t59-add-support-for-m48t02-and-m48t59-chips-2nd-rev.patch fb-convert-lock-unlock_kernel-into-local-fb-mutex.patch neofb-reduce-panning-function.patch viafb-accelc-accelh-update.patch viafb-viafbdevc-update.patch fbdev-kconfig-update.patch fbdev-kconfig-update-fix.patch neofb-kill-some-redundant-code.patch vga16fb-remove-open_lock-mutex.patch neofb-remove-open_lock-mutex.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html