patch-2_6_7-vs1_9_1_12

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

diff --git a/drivers/i2c/busses/scx200_acb.c b/drivers/i2c/busses/scx200_acb.c
index 2a33ae4..76a9d68 100644 (file)
--- a/drivers/i2c/busses/scx200_acb.c
+++ b/drivers/i2c/busses/scx200_acb.c
@@ -24,7 +24,6 @@
 
 */
 
-#include <linux/config.h>
 #include <linux/config.h>
 #include <linux/module.h>
 #include <linux/errno.h>
@@ -44,7 +43,7 @@ MODULE_DESCRIPTION("NatSemi SCx200 ACCESS.bus Driver");
 MODULE_LICENSE("GPL");
 
 #define MAX_DEVICES 4
-static int base[MAX_DEVICES] = { 0x840 };
+static int base[MAX_DEVICES] = { 0x820, 0x840 };
 MODULE_PARM(base, "1-4i");
 MODULE_PARM_DESC(base, "Base addresses for the ACCESS.bus controllers");
 
@@ -511,7 +510,10 @@ static int __init scx200_acb_init(void)
        /* Verify that this really is a SCx200 processor */
        if (pci_find_device(PCI_VENDOR_ID_NS,
                            PCI_DEVICE_ID_NS_SCx200_BRIDGE,
-                           NULL) == NULL)
+                           NULL) == NULL
+           && pci_find_device(PCI_VENDOR_ID_NS,
+                              PCI_DEVICE_ID_NS_SC1100_BRIDGE,
+                              NULL) == NULL)
                return -ENODEV;
 
        rc = -ENXIO;