diff options
Diffstat (limited to 'drivers/i2c/busses/i2c-pca-isa.c')
-rw-r--r-- | drivers/i2c/busses/i2c-pca-isa.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/i2c/busses/i2c-pca-isa.c b/drivers/i2c/busses/i2c-pca-isa.c index 5161aaf9341b..496ee875eb4f 100644 --- a/drivers/i2c/busses/i2c-pca-isa.c +++ b/drivers/i2c/busses/i2c-pca-isa.c | |||
@@ -125,6 +125,13 @@ static int __devinit pca_isa_probe(struct device *dev, unsigned int id) | |||
125 | 125 | ||
126 | dev_info(dev, "i/o base %#08lx. irq %d\n", base, irq); | 126 | dev_info(dev, "i/o base %#08lx. irq %d\n", base, irq); |
127 | 127 | ||
128 | #ifdef CONFIG_PPC_MERGE | ||
129 | if (check_legacy_ioport(base)) { | ||
130 | dev_err(dev, "I/O address %#08lx is not available\n", base); | ||
131 | goto out; | ||
132 | } | ||
133 | #endif | ||
134 | |||
128 | if (!request_region(base, IO_SIZE, "i2c-pca-isa")) { | 135 | if (!request_region(base, IO_SIZE, "i2c-pca-isa")) { |
129 | dev_err(dev, "I/O address %#08lx is in use\n", base); | 136 | dev_err(dev, "I/O address %#08lx is in use\n", base); |
130 | goto out; | 137 | goto out; |