The patch titled asiliantfb: fix ISO declaration/code warning has been removed from the -mm tree. Its filename was asiliantfb-fix-cmap-memory-leaks-fix.patch This patch was dropped because it was folded into asiliantfb-fix-cmap-memory-leaks.patch The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: asiliantfb: fix ISO declaration/code warning From: Randy Dunlap <randy.dunlap@xxxxxxxxxx> Move data declaration before any code: drivers/video/asiliantfb.c:515: warning: ISO C90 forbids mixed declarations and code Signed-off-by: Randy Dunlap <randy.dunlap@xxxxxxxxxx> Acked-by: Andres Salomon <dilinger@xxxxxxxxxx> Cc: Krzysztof Helt <krzysztof.h1@xxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/video/asiliantfb.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff -puN drivers/video/asiliantfb.c~asiliantfb-fix-cmap-memory-leaks-fix drivers/video/asiliantfb.c --- a/drivers/video/asiliantfb.c~asiliantfb-fix-cmap-memory-leaks-fix +++ a/drivers/video/asiliantfb.c @@ -507,12 +507,13 @@ static struct fb_var_screeninfo asiliant static int __devinit init_asiliant(struct fb_info *p, unsigned long addr) { + int err; + p->fix = asiliantfb_fix; p->fix.smem_start = addr; p->var = asiliantfb_var; p->fbops = &asiliantfb_ops; p->flags = FBINFO_DEFAULT; - int err; err = fb_alloc_cmap(&p->cmap, 256, 0); if (err) { _ Patches currently in -mm which might be from randy.dunlap@xxxxxxxxxx are origin.patch alpha-convert-u64-to-unsigned-long-long.patch filesystem-freeze-allow-sysrq-emergency-thaw-to-thaw-frozen-filesystems.patch atyfb-fix-header-file-trailing-whitespace.patch asiliantfb-fix-cmap-memory-leaks.patch asiliantfb-fix-cmap-memory-leaks-fix.patch linux-next.patch es-input-allow-certain-ev_abs-events-to-bypass-all-filtering-fix.patch input-drivers-input-xpadc-improve-xbox-360-wireless-support-and-add-sysfs-interface-fix.patch input-drivers-input-xpadc-improve-xbox-360-wireless-support-and-add-sysfs-interface-add-missing-prototype-and-update-history.patch e1000e-make-e1000e-default-to-the-same-kconfig-setting-as-e1000.patch esp-fix-section-mismatch-warning.patch qla2x-fix-printk-format-warnings.patch max3100-spi-uart-driver.patch mm-add-proc-controls-for-pdflush-threads-fix-99.patch cs553x-gpio-add-amd-cs5535-cs5536-gpio-driver-support-fix.patch documentation-ignore-byproducts-from-latex.patch cpusets-replace-zone-allowed-functions-with-node-allowed.patch namespaces-move-proc_net_get_sb-to-a-generic-fs-superc-helper-fix.patch kexec-add-dmesg-log-symbols-to-proc-vmcoreinfo-lists-fix-fix.patch kexec-add-dmesg-log-symbols-to-proc-vmcoreinfo-lists-fix-fix-fix.patch kexec-add-dmesg-log-symbols-to-proc-vmcoreinfo-lists-fix-fix-fix-fix.patch linuxpps-core-support.patch linuxpps-core-support-v2.patch auditsc-fix-kernel-doc-notation.patch reiser4-export-remove_from_page_cache-fix.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