Merge branch 'linus' into cont_syslog

[safe/jmp/linux-2.6] / drivers / i2c / busses / i2c-hydra.c

diff --git a/drivers/i2c/busses/i2c-hydra.c b/drivers/i2c/busses/i2c-hydra.c
index 1098f21..9ff1695 100644 (file)
--- a/drivers/i2c/busses/i2c-hydra.c
+++ b/drivers/i2c/busses/i2c-hydra.c
@@ -28,7 +28,7 @@
 #include <linux/i2c.h>
 #include <linux/i2c-algo-bit.h>
 #include <linux/init.h>
-#include <asm/io.h>
+#include <linux/io.h>
 #include <asm/hydra.h>
 
 
@@ -102,11 +102,10 @@ static struct i2c_algo_bit_data hydra_bit_data = {
 static struct i2c_adapter hydra_adap = {
        .owner          = THIS_MODULE,
        .name           = "Hydra i2c",
-       .id             = I2C_HW_B_HYDRA,
        .algo_data      = &hydra_bit_data,
 };
 
-static struct pci_device_id hydra_ids[] = {
+static const struct pci_device_id hydra_ids[] = {
        { PCI_DEVICE(PCI_VENDOR_ID_APPLE, PCI_DEVICE_ID_APPLE_HYDRA) },
        { 0, }
 };
@@ -123,7 +122,7 @@ static int __devinit hydra_probe(struct pci_dev *dev,
                                hydra_adap.name))
                return -EBUSY;
 
-       hydra_bit_data.data = ioremap(base, pci_resource_len(dev, 0));
+       hydra_bit_data.data = pci_ioremap_bar(dev, 0);
        if (hydra_bit_data.data == NULL) {
                release_mem_region(base+offsetof(struct Hydra, CachePD), 4);
                return -ENODEV;