The patch titled
pci-fix-multiple-problems-with-via-hardware-warning-fix fix
has been removed from the -mm tree. Its filename was
pci-fix-multiple-problems-with-via-hardware-warning-fix-fix.patch
This patch was dropped because it was folded into pci-fix-multiple-problems-with-via-hardware.patch
------------------------------------------------------
Subject: pci-fix-multiple-problems-with-via-hardware-warning-fix fix
From: Jean Delvare <khali@xxxxxxxxxxxx>
Now that PCI quirks are replayed on software resume, we can safely
re-enable the Asus SMBus unhiding quirk even when software suspend support
is enabled.
Signed-off-by: Jean Delvare <khali@xxxxxxxxxxxx>
Cc: Alan Cox <alan@xxxxxxxxxxxxxxxxxxx>
Cc: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@xxxxxxx>
Cc: Greg KH <greg@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/pci/quirks.c | 7 -------
1 files changed, 7 deletions(-)
diff -puN drivers/pci/quirks.c~pci-fix-multiple-problems-with-via-hardware-warning-fix-fix drivers/pci/quirks.c
--- a/drivers/pci/quirks.c~pci-fix-multiple-problems-with-via-hardware-warning-fix-fix
+++ a/drivers/pci/quirks.c
@@ -926,7 +926,6 @@ static void k8t_sound_hostbridge(struct
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_8237, k8t_sound_hostbridge);
DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_8237, k8t_sound_hostbridge);
-#ifndef CONFIG_ACPI_SLEEP
/*
* On ASUS P4B boards, the SMBus PCI Device within the ICH2/4 southbridge
* is not activated. The myth is that Asus said that they do not want the
@@ -938,10 +937,6 @@ DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_V
* bridge. Unfortunately, this device has no subvendor/subdevice ID. So it
* becomes necessary to do this tweak in two steps -- I've chosen the Host
* bridge as trigger.
- *
- * Actually, leaving it unhidden and not redoing the quirk over suspend2ram
- * will cause thermal management to break down, and causing machine to
- * overheat.
*/
static int __initdata asus_hides_smbus;
@@ -1099,8 +1094,6 @@ static void asus_hides_smbus_lpc_ich6(st
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH6_1, asus_hides_smbus_lpc_ich6 );
DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH6_1, asus_hides_smbus_lpc_ich6 );
-#endif
-
/*
* SiS 96x south bridge: BIOS typically hides SMBus device...
*/
_
Patches currently in -mm which might be from khali@xxxxxxxxxxxx are
origin.patch
git-alsa.patch
pci-fix-multiple-problems-with-via-hardware.patch
pci-fix-multiple-problems-with-via-hardware-warning-fix-fix.patch
maintainers-update-the-i2c-and-hwmon-subsystems-info.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
