rpms/kernel/FC-4 linux-2.6-acpi-20050902.patch,1.2,1.3

[fedora-cvs-commits at redhat.com]

Author: davej

Update of /cvs/dist/rpms/kernel/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv16286

Modified Files:
	linux-2.6-acpi-20050902.patch 
Log Message:
build fix


linux-2.6-acpi-20050902.patch:
 b/arch/i386/kernel/acpi/Makefile                    |    2 
 b/arch/i386/kernel/acpi/boot.c                      |    7 
 b/arch/i386/kernel/acpi/cstate.c                    |   58 
 b/arch/i386/kernel/acpi/processor.c                 |   75 +
 b/arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c       |   67 -
 b/arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c |   12 
 b/arch/ia64/kernel/acpi-ext.c                       |    2 
 b/arch/ia64/kernel/cpufreq/Makefile                 |    5 
 b/arch/ia64/kernel/cpufreq/acpi-cpufreq.c           |   51 
 b/arch/ia64/kernel/cpufreq/acpi-processor.c         |   67 +
 b/arch/x86_64/kernel/acpi/Makefile                  |    5 
 b/arch/x86_64/kernel/acpi/processor.c               |   72 +
 b/drivers/acpi/Kconfig                              |    1 
 b/drivers/acpi/Makefile                             |    2 
 b/drivers/acpi/ec.c                                 |    2 
 b/drivers/acpi/glue.c                               |    6 
 b/drivers/acpi/motherboard.c                        |    4 
 b/drivers/acpi/pci_link.c                           |   10 
 b/drivers/acpi/pci_root.c                           |    6 
 b/drivers/acpi/processor_core.c                     |   43 
 b/drivers/acpi/processor_idle.c                     |   31 
 b/drivers/acpi/processor_perflib.c                  |    2 
 b/drivers/acpi/processor_thermal.c                  |   38 
 b/drivers/acpi/resources/rsaddr.c                   |   99 -
 b/drivers/acpi/resources/rscalc.c                   |  987 +++++++--------
 b/drivers/acpi/resources/rsdump.c                   | 1300 +++++++++-----------
 b/drivers/acpi/resources/rsio.c                     |   56 
 b/drivers/acpi/resources/rsirq.c                    |   57 
 b/drivers/acpi/resources/rslist.c                   |  529 ++------
 b/drivers/acpi/resources/rsmemory.c                 |   68 -
 b/drivers/acpi/resources/rsmisc.c                   |  234 +++
 b/drivers/acpi/resources/rsxface.c                  |    8 
 b/drivers/acpi/scan.c                               |    2 
 b/drivers/acpi/thermal.c                            |  163 +-
 b/drivers/acpi/utilities/utmisc.c                   |    2 
 b/drivers/acpi/utilities/utmutex.c                  |    4 
 b/drivers/acpi/video.c                              |    2 
 b/drivers/pnp/pnpacpi/rsparser.c                    |   36 
 b/drivers/serial/8250_acpi.c                        |    6 
 b/include/acpi/acconfig.h                           |    4 
 b/include/acpi/acdisasm.h                           |   36 
 b/include/acpi/aclocal.h                            |   23 
 b/include/acpi/acresrc.h                            |   46 
 b/include/acpi/actypes.h                            |   13 
 b/include/acpi/amlresrc.h                           |   56 
 b/include/acpi/pdc_intel.h                          |    4 
 b/include/acpi/platform/acenv.h                     |    1 
 b/include/acpi/processor.h                          |   22 
 b/include/asm-i386/acpi.h                           |    2 
 b/kernel/power/main.c                               |    4 
 linux-2.6.14/drivers/char/hpet.c                    |    2 
 linux-2.6.14/drivers/pci/hotplug/pciehprm_acpi.c    |    4 
 linux-2.6.14/drivers/pci/hotplug/shpchprm_acpi.c    |    4 
 53 files changed, 2151 insertions(+), 2191 deletions(-)

Index: linux-2.6-acpi-20050902.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/linux-2.6-acpi-20050902.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- linux-2.6-acpi-20050902.patch	10 Dec 2005 08:20:43 -0000	1.2
+++ linux-2.6-acpi-20050902.patch	10 Dec 2005 08:33:56 -0000	1.3
@@ -7376,3 +7376,23 @@
  			break;
  		}
  
+--- linux-2.6.14/drivers/pci/hotplug/shpchprm_acpi.c~	2005-12-10 03:33:10.000000000 -0500
++++ linux-2.6.14/drivers/pci/hotplug/shpchprm_acpi.c	2005-12-10 03:33:26.000000000 -0500
+@@ -649,7 +649,7 @@ static acpi_status acpi_parse_crs(
+ 
+ 	while (!done) {
+ 		dbg("acpi_shpchprm: PCI bus 0x%x Resource structure %x.\n", ab->bus, count++);
+-		switch (resource->id) {
++		switch (resource->type) {
+ 		case ACPI_RSTYPE_IRQ:
+ 			dbg("Irq -------- Resource\n");
+ 			break; 
+@@ -697,7 +697,7 @@ static acpi_status acpi_parse_crs(
+ 			dbg("Ext Irq -------- Resource\n");
+ 			break; 
+ 		default:
+-			dbg("Invalid -------- resource type 0x%x\n", resource->id);
++			dbg("Invalid -------- resource type 0x%x\n", resource->type);
+ 			break;
+ 		}
+