r3656 - trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches

[Simon Horman]

Author: horms
Date: 2005-08-01 09:31:10 +0000 (Mon, 01 Aug 2005)
New Revision: 3656

Modified:
   trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/142_acpi_skip_timer_override-4.diff
Log:
rediff reversed patch

Modified: trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/142_acpi_skip_timer_override-4.diff
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/142_acpi_skip_timer_override-4.diff	2005-08-01 09:29:22 UTC (rev 3655)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/142_acpi_skip_timer_override-4.diff	2005-08-01 09:31:10 UTC (rev 3656)
@@ -7,8 +7,8 @@
 #   Signed-off-by: Horms <horms at verge.net.au>
 #
 ===== arch/i386/kernel/earlyquirk.c 1.1 vs 1.2 =====
---- a/arch/i386/kernel/Makefile	2005-03-24 15:47:08.391718540 +0900
-+++ b/arch/i386/kernel/Makefile	2005-03-24 15:46:56.433281792 +0900
+--- a/arch/i386/kernel/Makefile	2005-08-01 16:26:02.000000000 +0900
++++ b/arch/i386/kernel/Makefile	2005-08-01 16:26:20.000000000 +0900
 @@ -36,11 +36,11 @@
  obj-$(CONFIG_X86_CPUID)		+= cpuid.o
  obj-$(CONFIG_MICROCODE)		+= microcode.o
@@ -18,7 +18,8 @@
  obj-$(CONFIG_ACPI_SLEEP)	+= acpi_wakeup.o
  obj-$(CONFIG_SMP)		+= smp.o smpboot.o trampoline.o
  obj-$(CONFIG_X86_LOCAL_APIC)	+= mpparse.o apic.o nmi.o
- obj-$(CONFIG_X86_IO_APIC)	+= io_apic.o
++obj-$(CONFIG_X86_IO_APIC)	+= io_apic.o
+-obj-$(CONFIG_X86_IO_APIC)	+= io_apic.o earlyquirk.o
  obj-$(CONFIG_X86_VISWS_APIC)	+= visws_apic.o
  obj-$(CONFIG_CPU_EMU486)	+= emu.o
  obj-$(CONFIG_EDD)             	+= edd.o