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

[Simon Horman]

Author: horms
Date: 2005-03-24 08:17:18 +0000 (Thu, 24 Mar 2005)
New Revision: 2810

Modified:
   trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/142_acpi_skip_timer_override-3.diff
Log:
reinstated correct patch

Modified: trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/142_acpi_skip_timer_override-3.diff
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/142_acpi_skip_timer_override-3.diff	2005-03-24 08:13:48 UTC (rev 2809)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/142_acpi_skip_timer_override-3.diff	2005-03-24 08:17:18 UTC (rev 2810)
@@ -1,25 +1,50 @@
-# origin: Horms <horms@verge.net.au>
-# inclusion: submitted upstream
-# descrition: [PATCH] earlyquirk.o is needed for CONFIG_ACPI_BOOT
+# origin: cw (BitKeeper)
+# cset: 1.1573 (2.4) key=4230b52ab1OLa1_0ikwHhoMode5Ggg
+# URL: http://linux.bkbits.net:8080/linux-2.4/cset@4230b52ab1OLa1_0ikwHhoMode5Ggg
+# inclusion: upstream
+# descrition: [PATCH] early boot code references check_acpi_pci()
+# revision date: Wed, 23 Mar 2005 18:09:48 +0900
 #
-#   [PATCH] earlyquirk.o is needed for CONFIG_ACPI_BOOT
+# S rset: ChangeSet|1.1572..1.1573
+# I rset: arch/i386/kernel/earlyquirk.c|1.1..1.2
+#
+# Key:
+# S: Skipped  ChangeSet file only
+# O: Original Followed by Updated
+# U: Updated  Included with updated range of versions
+# I: Included Included verbatim
+# E: Excluded Excluded on request from user
+# D: Deleted  Manually deleted by subsequent user edit
+# R: Revised  Manually revised by subsequent user edit
+#
+#
+# This is a BitKeeper generated diff -Nru style patch.
+#
+# arch/i386/kernel/earlyquirk.c
+#   2005/03/10 18:29:55-03:00 cw@f00f.org +1 -1
+#   early boot code references check_acpi_pci()
+# 
+# ChangeSet
+#   2005/03/10 17:59:22-03:00 cw@f00f.org 
+#   [PATCH] early boot code references check_acpi_pci()
 #   
-#   Signed-off-by: Horms <horms@verge.net.au>
+#   For x86 (and friends) ACPI_BOOT=y (always) and this code wants to call
+#   check_acpi_pci().
+#   
+#   Signed-off-by: Chris Wedgwood <cw@f00f.org>
+#   
+#   ===== arch/i386/kernel/earlyquirk.c 1.1 vs edited =====
+# 
 #
 ===== 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.noedit	2005-03-24 15:46:56.433281792 +0900
-@@ -36,11 +36,11 @@
- obj-$(CONFIG_X86_CPUID)		+= cpuid.o
- obj-$(CONFIG_MICROCODE)		+= microcode.o
- obj-$(CONFIG_APM)		+= apm.o
--obj-$(CONFIG_ACPI_BOOT)		+= acpi.o earlyquirk.o
-+obj-$(CONFIG_ACPI_BOOT)		+= acpi.o
- 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 earlyquirk.o
- obj-$(CONFIG_X86_VISWS_APIC)	+= visws_apic.o
- obj-$(CONFIG_CPU_EMU486)	+= emu.o
- obj-$(CONFIG_EDD)             	+= edd.o
+--- 1.1/arch/i386/kernel/earlyquirk.c	2005-02-18 23:53:58 +09:00
++++ 1.2/arch/i386/kernel/earlyquirk.c	2005-03-11 06:29:55 +09:00
+@@ -8,7 +8,7 @@
+ #include <asm/pci-direct.h>
+ #include <asm/acpi.h>
+ 
+-#ifdef CONFIG_ACPI
++#ifdef CONFIG_ACPI_BOOT
+ static int __init check_bridge(int vendor, int device) 
+ {
+ 	/* According to Nvidia all timer overrides are bogus. Just ignore