This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / drivers / i2c / busses / i2c-piix4.c

diff --git a/drivers/i2c/busses/i2c-piix4.c b/drivers/i2c/busses/i2c-piix4.c
index e7c0262..31ee543 100644 (file)
--- a/drivers/i2c/busses/i2c-piix4.c
+++ b/drivers/i2c/busses/i2c-piix4.c
@@ -40,7 +40,6 @@
 #include <linux/i2c.h>
 #include <linux/init.h>
 #include <linux/apm_bios.h>
-#include <linux/dmi.h>
 #include <asm/io.h>
 
 
@@ -115,13 +114,18 @@ static int piix4_transaction(void);
 static unsigned short piix4_smba = 0;
 static struct i2c_adapter piix4_adapter;
 
-static struct dmi_system_id __devinitdata piix4_dmi_table[] = {
-       {
-               .ident = "IBM",
-               .matches = { DMI_MATCH(DMI_SYS_VENDOR, "IBM"), },
-       },
-       { },
-};
+/*
+ * Get DMI information.
+ */
+static int __devinit ibm_dmi_probe(void)
+{
+#ifdef CONFIG_X86
+       extern int is_unsafe_smbus;
+       return is_unsafe_smbus;
+#else
+       return 0;
+#endif
+}
 
 static int __devinit piix4_setup(struct pci_dev *PIIX4_dev,
                                const struct pci_device_id *id)
@@ -134,9 +138,7 @@ static int __devinit piix4_setup(struct pci_dev *PIIX4_dev,
 
        dev_info(&PIIX4_dev->dev, "Found %s device\n", pci_name(PIIX4_dev));
 
-       /* Don't access SMBus on IBM systems which get corrupted eeproms */
-       if (dmi_check_system(piix4_dmi_table) &&
-                       PIIX4_dev->vendor == PCI_VENDOR_ID_INTEL) {
+       if(ibm_dmi_probe()) {
                dev_err(&PIIX4_dev->dev, "IBM Laptop detected; this module "
                        "may corrupt your serial eeprom! Refusing to load "
                        "module!\n");