rpms/kernel/devel linux-2.6-pciehp-update.patch,1.1,1.2

[Matthew Garrett]

Author: mjg59

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25634

Modified Files:
	linux-2.6-pciehp-update.patch 
Log Message:
Add the module alias for pciehp


linux-2.6-pciehp-update.patch:

Index: linux-2.6-pciehp-update.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-pciehp-update.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-pciehp-update.patch	3 Nov 2008 16:56:00 -0000	1.1
+++ linux-2.6-pciehp-update.patch	3 Nov 2008 19:00:06 -0000	1.2
@@ -1,6 +1,6 @@
-diff -ur vanilla-2.6.27/drivers/pci/hotplug/pciehp_core.c vanilla-2.6.27.pcie/drivers/pci/hotplug/pciehp_core.c
+diff -ur vanilla-2.6.27/drivers/pci/hotplug/pciehp_core.c linux-2.6.27.noarch.p4/drivers/pci/hotplug/pciehp_core.c
 --- vanilla-2.6.27/drivers/pci/hotplug/pciehp_core.c	2008-10-09 23:13:53.000000000 +0100
-+++ vanilla-2.6.27.pcie/drivers/pci/hotplug/pciehp_core.c	2008-11-03 16:49:43.000000000 +0000
++++ linux-2.6.27.noarch.p4/drivers/pci/hotplug/pciehp_core.c	2008-11-03 18:51:51.000000000 +0000
 @@ -41,6 +41,7 @@
  int pciehp_poll_mode;
  int pciehp_poll_time;
@@ -9,7 +9,13 @@
  struct workqueue_struct *pciehp_wq;
  
  #define DRIVER_VERSION	"0.4"
-@@ -55,10 +56,12 @@
+@@ -50,15 +51,18 @@
+ MODULE_AUTHOR(DRIVER_AUTHOR);
+ MODULE_DESCRIPTION(DRIVER_DESC);
+ MODULE_LICENSE("GPL");
++MODULE_ALIAS("acpi*:PNP0A08:*");
+ 
+ module_param(pciehp_debug, bool, 0644);
  module_param(pciehp_poll_mode, bool, 0644);
  module_param(pciehp_poll_time, int, 0644);
  module_param(pciehp_force, bool, 0644);
@@ -22,7 +28,7 @@
  
  #define PCIE_MODULE_NAME "pciehp"
  
-@@ -85,6 +88,13 @@
+@@ -85,6 +89,13 @@
    	.get_cur_bus_speed =	get_cur_bus_speed,
  };
  
@@ -36,7 +42,7 @@
  /*
   * Check the status of the Electro Mechanical Interlock (EMI)
   */
-@@ -208,7 +218,11 @@
+@@ -208,7 +219,11 @@
  		hotplug_slot->name = slot->name;
  		hotplug_slot->private = slot;
  		hotplug_slot->release = &release_slot;
@@ -49,7 +55,7 @@
  		get_power_status(hotplug_slot, &info->power_status);
  		get_attention_status(hotplug_slot, &info->attention_status);
  		get_latch_status(hotplug_slot, &info->latch_status);
-@@ -401,10 +415,7 @@
+@@ -401,10 +416,7 @@
  	u8 value;
  	struct pci_dev *pdev = dev->port;
  
@@ -61,7 +67,7 @@
  		goto err_out_none;
  
  	ctrl = pcie_init(dev);
-@@ -468,7 +479,7 @@
+@@ -468,7 +480,7 @@
  static int pciehp_resume (struct pcie_device *dev)
  {
  	printk("%s ENTRY\n", __func__);
@@ -70,10 +76,9 @@
  		struct controller *ctrl = get_service_data(dev);
  		struct slot *t_slot;
  		u8 status;
-Only in vanilla-2.6.27.pcie/drivers/pci/hotplug: pciehp_core.c~
-diff -ur vanilla-2.6.27/drivers/pci/hotplug/pciehp.h vanilla-2.6.27.pcie/drivers/pci/hotplug/pciehp.h
+diff -ur vanilla-2.6.27/drivers/pci/hotplug/pciehp.h linux-2.6.27.noarch.p4/drivers/pci/hotplug/pciehp.h
 --- vanilla-2.6.27/drivers/pci/hotplug/pciehp.h	2008-10-09 23:13:53.000000000 +0100
-+++ vanilla-2.6.27.pcie/drivers/pci/hotplug/pciehp.h	2008-11-03 16:46:45.000000000 +0000
++++ linux-2.6.27.noarch.p4/drivers/pci/hotplug/pciehp.h	2008-11-03 16:53:57.000000000 +0000
 @@ -206,6 +206,10 @@
  {
  	u32 flags = (OSC_PCI_EXPRESS_NATIVE_HP_CONTROL |
@@ -85,4 +90,3 @@
  	return acpi_get_hp_hw_control_from_firmware(dev, flags);
  }
  
-Only in vanilla-2.6.27.pcie/drivers/pci/hotplug: pciehp.h~