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

[Simon Horman]

Author: horms
Date: 2005-03-22 11:49:19 +0100 (Tue, 22 Mar 2005)
New Revision: 2785

Modified:
   trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/141_acpi_pci_probe.diff
Log:
removed pre-applied portion of patch

Modified: trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/141_acpi_pci_probe.diff
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/141_acpi_pci_probe.diff	2005-03-22 09:44:51 UTC (rev 2784)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/141_acpi_pci_probe.diff	2005-03-22 10:49:19 UTC (rev 2785)
@@ -12,7 +12,7 @@
 # D rset: arch/x86_64/kernel/e820.c|1.20..1.21
 # D rset: drivers/acpi/bus.c|1.27..1.28
 # D rset: arch/x86_64/kernel/pci-pc.c|1.8..1.9
-# R rset: include/asm-x86_64/acpi.h|1.13..1.14
+# D rset: include/asm-x86_64/acpi.h|1.13..1.14
 # D rset: arch/i386/kernel/acpi.c|1.29..1.30
 # D rset: arch/x86_64/kernel/acpi.c|1.17..1.19
 # D rset: Documentation/kernel-parameters.txt|1.15..1.16
@@ -99,15 +99,3 @@
  				&& (tmp->id.bus == root->id.bus)) {
  			int bus = 0;
  			acpi_status status;
-===== drivers/acpi/pci_root.c =====
---- ./arch/x86_64/kernel/acpi.c.orig	2004-08-08 08:26:04.000000000 +0900
-+++ ./arch/x86_64/kernel/acpi.c	2005-02-24 16:26:34.000000000 +0900
-@@ -342,7 +342,7 @@ acpi_parse_int_src_ovr (
- 	return 0;
- }
- 
--
-+#ifdef CONFIG_HPET_TIMER
- static int __init
- acpi_parse_nmi_src (
- 	acpi_table_entry_header *header)