From 1e2b3bdaa770fa2d6fe8435e57cd2452d91cd18b Mon Sep 17 00:00:00 2001 From: Geert Uytterhoeven Date: Tue, 7 May 2013 10:27:53 +0200 Subject: h8300: Fix Ten years ago, a mismerge happened, concatenating two slightly different versions of the same file. As a consequence, 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 Acked-by: Yoshinori Sato --- arch/h8300/include/asm/tlb.h | 15 --------------- 1 file changed, 15 deletions(-) (limited to 'arch/h8300') diff --git a/arch/h8300/include/asm/tlb.h b/arch/h8300/include/asm/tlb.h index 3dea80ad9e6f..7f0743051ad5 100644 --- a/arch/h8300/include/asm/tlb.h +++ b/arch/h8300/include/asm/tlb.h @@ -1,16 +1,3 @@ -/* - include/asm-h8300/tlb.h -*/ - -#ifndef __H8300_TLB_H__ -#define __H8300_TLB_H__ - -#define tlb_flush(tlb) do { } while(0) - -/* - include/asm-h8300/tlb.h -*/ - #ifndef __H8300_TLB_H__ #define __H8300_TLB_H__ @@ -19,5 +6,3 @@ #include #endif - -#endif -- cgit v1.2.3