- i5k_amb-load-automatically-on-all-5000-5400-chipsets.patch removed from -mm tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



The patch titled
     i5k_amb: load automatically on all 5000/5400 chipsets
has been removed from the -mm tree.  Its filename was
     i5k_amb-load-automatically-on-all-5000-5400-chipsets.patch

This patch was dropped because it was merged into mainline or a subsystem tree

The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/

------------------------------------------------------
Subject: i5k_amb: load automatically on all 5000/5400 chipsets
From: "Darrick J. Wong" <djwong@xxxxxxxxxx>

It turns out that we cannot create a pci_driver in this driver because PCI
will not call this module's probe function if the i5000-edac driver is
already loaded.  That said, we only want one value (AMBASE) from the PCI
config space.  Neither driver alters this value, so it's safe to read it. 
However, we still want the module aliases, so provide that.

Signed-off-by: Darrick J. Wong <djwong@xxxxxxxxxx>
Cc: Jean Delvare <khali@xxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---

 drivers/hwmon/i5k_amb.c |    8 ++++++++
 1 file changed, 8 insertions(+)

diff -puN drivers/hwmon/i5k_amb.c~i5k_amb-load-automatically-on-all-5000-5400-chipsets drivers/hwmon/i5k_amb.c
--- a/drivers/hwmon/i5k_amb.c~i5k_amb-load-automatically-on-all-5000-5400-chipsets
+++ a/drivers/hwmon/i5k_amb.c
@@ -497,6 +497,14 @@ static struct pci_device_id i5k_amb_ids[
 };
 MODULE_DEVICE_TABLE(pci, i5k_amb_ids);
 
+static struct pci_device_id i5k_amb_ids[] __devinitdata = {
+	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_5000_ERR) },
+	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_5400_ERR) },
+	{ 0, },
+};
+
+MODULE_DEVICE_TABLE(pci, i5k_amb_ids);
+
 static int __devinit i5k_amb_probe(struct platform_device *pdev)
 {
 	struct i5k_amb_data *data;
_

Patches currently in -mm which might be from djwong@xxxxxxxxxx are

fix-platform-drivers-that-crash-on-suspend-resume.patch
i5000-edac-hold-reference-to-mci-kobject.patch
adt7470-check-input-range-when-sysfs-files-are-written.patch
adt7473-check-inputs-from-sysfs-writes.patch
lm85-support-adt7468-chips.patch
adt7462-new-hwmon-driver.patch
ics932s401-new-driver.patch
linux-next.patch
i5k_amb-load-automatically-on-all-5000-5400-chipsets.patch
ibmpex-add-endian-annotation-to-extract_data-helper.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

[Index of Archives]     [Kernel Newbies FAQ]     [Kernel Archive]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [Bugtraq]     [Photo]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]

  Powered by Linux