lkml.org 
[lkml]   [2006]   [Feb]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
DateMon, 20 Feb 2006 23:21:59 -0700
Fromjohn stultz <>
Subject[-mm PATCH 9/11] Time: i386 conversion part 3 - backout pmtmr changes
Backout pmtmr_ioport changes to avoid conflicting w/ x86-64

Signed-off-by: John Stultz <johnstul@us.ibm.com>

arch/i386/kernel/acpi/boot.c | 2 +-
arch/i386/kernel/time.c | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
Index: mm-merge/arch/i386/kernel/acpi/boot.c
===================================================================
--- mm-merge.orig/arch/i386/kernel/acpi/boot.c
+++ mm-merge/arch/i386/kernel/acpi/boot.c
@@ -616,7 +616,7 @@ static int __init acpi_parse_hpet(unsign
#endif

#ifdef CONFIG_X86_PM_TIMER
-u32 pmtmr_ioport;
+extern u32 pmtmr_ioport;
#endif

static int __init acpi_parse_fadt(unsigned long phys, unsigned long size)
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
\
 
 \ /
  Last update: 2006-02-21 07:28    [from the cache]
©2003-2010