From 342672295f72b2f23e3f8a0ffc2709de5049cb21 Mon Sep 17 00:00:00 2001 From: Paul Bolle Date: Thu, 11 Apr 2013 18:49:42 +0200 Subject: [PATCH] --- yaml --- r: 366245 b: refs/heads/master c: a7e6567585e513cb4e44387831cb75eb5b562cbb h: refs/heads/master i: 366243: e8f12cb8623c72693f3019d41c71e7c223381d16 v: v3 --- [refs] | 2 +- trunk/arch/x86/include/asm/fixmap.h | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 044ad6744894..ded7dd258190 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7e9a2f0a080ba2f247559e95eb0df7072bede18a +refs/heads/master: a7e6567585e513cb4e44387831cb75eb5b562cbb diff --git a/trunk/arch/x86/include/asm/fixmap.h b/trunk/arch/x86/include/asm/fixmap.h index a09c28571064..83ea2fb5fc75 100644 --- a/trunk/arch/x86/include/asm/fixmap.h +++ b/trunk/arch/x86/include/asm/fixmap.h @@ -107,9 +107,6 @@ enum fixed_addresses { #ifdef CONFIG_X86_F00F_BUG FIX_F00F_IDT, /* Virtual mapping for IDT */ #endif -#ifdef CONFIG_X86_CYCLONE_TIMER - FIX_CYCLONE_TIMER, /*cyclone timer register*/ -#endif #ifdef CONFIG_X86_32 FIX_KMAP_BEGIN, /* reserved pte's for temporary kernel mappings */ FIX_KMAP_END = FIX_KMAP_BEGIN+(KM_TYPE_NR*NR_CPUS)-1,