From: Paul Mundt <lethal@linux-sh.org>
Date: Sat, 11 Jul 2009 01:08:33 +0000 (+0900)
Subject: Merge branches 'sh/ftrace' and 'sh/stable-updates'
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=f686d8c11c61143b9705ed38d8cd26b0643902a4;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git

Merge branches 'sh/ftrace' and 'sh/stable-updates'
---

f686d8c11c61143b9705ed38d8cd26b0643902a4
diff --cc arch/sh/Kconfig
index 46d1a5e71f77,6d110a4f7f65,e2bdd7b94fd9..120bd31a46ea
--- a/arch/sh/Kconfig
+++ b/arch/sh/Kconfig
@@@@ -32,8 -31,9 -31,6 +32,9 @@@@ config SUPERH3
   	select HAVE_FUNCTION_TRACER
   	select HAVE_FTRACE_MCOUNT_RECORD
   	select HAVE_DYNAMIC_FTRACE
  +	select HAVE_FUNCTION_TRACE_MCOUNT_TEST
  +	select HAVE_FTRACE_SYSCALLS
+ +	select HAVE_FUNCTION_GRAPH_TRACER
   	select HAVE_ARCH_KGDB
   	select ARCH_HIBERNATION_POSSIBLE if MMU
   
diff --cc drivers/video/sh_mobile_lcdcfb.c
index 65806ec3313b,da983b720f08,8f24564f77b0..98fb82f11611
--- a/drivers/video/sh_mobile_lcdcfb.c
+++ b/drivers/video/sh_mobile_lcdcfb.c
@@@@ -920,8 -932,9 -939,10 +927,9 @@@@ static int sh_mobile_lcdc_remove(struc
   		dma_free_coherent(&pdev->dev, info->fix.smem_len,
   				  info->screen_base, priv->ch[i].dma_handle);
   		fb_dealloc_cmap(&info->cmap);
++ 		framebuffer_release(info);
   	}
   
 --#ifdef CONFIG_HAVE_CLK
   	if (priv->dot_clk)
   		clk_put(priv->dot_clk);
   	clk_put(priv->clk);