From: Geert Uytterhoeven <geert@linux-m68k.org>
Date: Tue, 7 May 2013 08:27:53 +0000 (+0200)
Subject: h8300: Fix <asm/tlb.h>
X-Git-Tag: omap-for-v3.11/fixes-for-merge-window~36^2~13
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1e2b3bdaa770fa2d6fe8435e57cd2452d91cd18b;p=pandora-kernel.git

h8300: Fix <asm/tlb.h>

Ten years ago, a mismerge happened, concatenating two slightly different
versions of the same file. As a consequence, <asm-generic/tlb.h> was never
included, leading to a build failure only now:

kernel/cpu/idle.c: In function 'cpu_idle_loop':
kernel/cpu/idle.c:70:4: error: implicit declaration of function 'check_pgt_cache' [-Werror=implicit-function-declaration]

Remove the duplicates, and the header comment with the no longer correct
file name.

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Acked-by: Yoshinori Sato <ysato@users.sourceforge.jp>
---

Reading git-diff-tree failed