The patch titled cirrusfb: fix compilation of Zorro code has been removed from the -mm tree. Its filename was cirrusfb-convert-printks-to-dev_foo-fix-fix3.patch This patch was dropped because it was folded into cirrusfb-convert-printks-to-dev_foo.patch The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: cirrusfb: fix compilation of Zorro code From: Krzysztof Helt <krzysztof.h1@xxxxx> Add a missing comma. Also, push down frequencies for the SD64 card as it is based on a GD5434 chip and cannot do more than a GD5446 chip. Signed-off-by: Krzysztof Helt <krzysztof.h1@xxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/video/cirrusfb.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff -puN drivers/video/cirrusfb.c~cirrusfb-convert-printks-to-dev_foo-fix-fix3 drivers/video/cirrusfb.c --- a/drivers/video/cirrusfb.c~cirrusfb-convert-printks-to-dev_foo-fix-fix3 +++ a/drivers/video/cirrusfb.c @@ -137,7 +137,7 @@ static const struct cirrusfb_board_info_ .maxclock = { /* guess */ /* the SD64/P4 have a higher max. videoclock */ - 140000, 140000, 140000, 140000, 140000, + 135100, 135100, 85500, 85500, 0 }, .init_sr07 = true, .init_sr1f = true, @@ -2321,7 +2321,7 @@ static int __devinit cirrusfb_zorro_regi cinfo->unmap = cirrusfb_zorro_unmap; dev_info(info->device, - "Cirrus Logic chipset on Zorro bus, RAM (%lu MB) at $%lx\n" + "Cirrus Logic chipset on Zorro bus, RAM (%lu MB) at $%lx\n", board_size / MB_, board_addr); zorro_set_drvdata(z, info); _ Patches currently in -mm which might be from krzysztof.h1@xxxxx are origin.patch cirrusfb-convert-printks-to-dev_foo.patch cirrusfb-convert-printks-to-dev_foo-fix-fix3.patch cirrusfb-fix-laguna-chipset-memory-detection-and-clock-setting.patch cirrusfb-add-laguna-additional-overflow-register.patch cirrusfb-add-mmio-registers-for-laguna-chipsets.patch cirrusfb-do-not-calculate-line-length-twice.patch cirrusfb-use-5-6-5-rgb-for-16bpp-mode.patch cirrusfb-various-improvements.patch cirrusfb-laguna-chipset-8bpp-fix.patch cirrusfb-check_var-improvements.patch cirrusfb-various-laguna-fixes.patch cirrusfb-acceleration-improvements.patch cirrusfb-add-imageblit-function.patch cirrusfb-fix-error-paths-in-cirrusfb_xxx_register.patch cirrusfb-fix-error-paths-in-cirrusfb_xxx_register-fix.patch cirrusfb-gd5446-fixes.patch cirrusfb-use-24bpp-instead-of-32bpp.patch cirrusfb-fix-clock-doubling.patch cirrusfb-fix-clock-doubling-fix.patch cirrusfb-add-accelerator-constant.patch cirrusfb-add-accelerator-constantpatch-compilation-fix.patch cirrusfb-set-mclk-in-one-place.patch cirrusfb-set-mclk-in-one-place-fix.patch cirrusfb-gd5434-aka-sd64-support-fixed.patch cirrusfb-fix-threshold-register-mask-for-laguna-chips.patch cirrusfb-fix-interlaced-modes.patch drivers-video-sgivwfbc-fix-memory-leaks-in-removal-path.patch tdfxfb-fix-memory-leaks-in-removal-path.patch tridentfb-fix-memory-leaks-in-removal-path.patch vfb-fix-memory-leaks-in-removal-path.patch sstfb-check-fb_alloc_cmap-return-value-and-handle-failure-properly.patch stifb-check-fb_alloc_cmap-return-value-and-handle-failure-properly.patch valkyriefb-check-fb_alloc_cmap-return-value-and-handle-failure-properly.patch 68328fb-fix-cmap-memory-leaks.patch amba-clcd-fix-cmap-memory-leaks.patch amifb-check-fb_alloc_cmap-return-value-and-handle-failure-properly.patch asiliantfb-fix-cmap-memory-leaks.patch asiliantfb-fix-cmap-memory-leaks-fix.patch remove-cyblafb-driver.patch nvidiafb-remove-open_lock-mutex.patch fb-hide-hardware-cursor-in-graphics-mode-mach64.patch atyfb-speed-up-mach64-cursor.patch tridentfb-delete-acceleration-kconfig-option.patch linux-next.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