Re: [PATCH 3/4] new timeofday x86-64 arch specific changes (v. B1)

[Parag Warudkar <kernel-stuff@comcast.net>]

On Wednesday 01 June 2005 19:13, john stultz wrote:
> This patch converts the x86-64 arch to use the new timeofday
> infrastructure. It applies on top of my timeofday-core_B1 patch.

This one fails to apply - time.c HUNK #1 gets rejected. (Attached)

Parag

***************
*** 26,35 ****
  #include <linux/sysdev.h>
  #include <linux/bcd.h>
  #include <linux/kallsyms.h>
- #include <linux/acpi.h>
- #ifdef CONFIG_ACPI
- #include <acpi/achware.h>	/* for PM timer frequency */
- #endif
  #include <asm/8253pit.h>
  #include <asm/pgtable.h>
  #include <asm/vsyscall.h>
--- 26,31 ----
  #include <linux/sysdev.h>
  #include <linux/bcd.h>
  #include <linux/kallsyms.h>
  #include <asm/8253pit.h>
  #include <asm/pgtable.h>
  #include <asm/vsyscall.h>