diff options
| author | Kumar Gala <galak@kernel.crashing.org> | 2008-09-22 14:41:31 -0700 |
|---|---|---|
| committer | Kumar Gala <galak@kernel.crashing.org> | 2008-09-23 10:41:28 -0500 |
| commit | 68e1ee62f0f8e556642a59ebaf0c2cc2ac6ccfa6 (patch) | |
| tree | 919ec52758fd0b77f8e429d1eb135835532c49c7 /drivers/i2c | |
| parent | 1e16dfc1baa745dd89b95f6e33e4142df6218066 (diff) | |
| download | linux-68e1ee62f0f8e556642a59ebaf0c2cc2ac6ccfa6.tar.gz linux-68e1ee62f0f8e556642a59ebaf0c2cc2ac6ccfa6.tar.bz2 linux-68e1ee62f0f8e556642a59ebaf0c2cc2ac6ccfa6.zip | |
powerpc: convert CONFIG_PPC_MERGE to CONFIG_PPC for legacy io checks
Now that arch/ppc is dead CONFIG_PPC_MERGE is always defined for all
powerpc platforms and we want to get rid of CONFIG_PPC_MERGE use
CONFIG_PPC instead.
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Diffstat (limited to 'drivers/i2c')
| -rw-r--r-- | drivers/i2c/busses/i2c-pca-isa.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/i2c/busses/i2c-pca-isa.c b/drivers/i2c/busses/i2c-pca-isa.c index a119784bae10..28d8463b74ad 100644 --- a/drivers/i2c/busses/i2c-pca-isa.c +++ b/drivers/i2c/busses/i2c-pca-isa.c @@ -113,7 +113,7 @@ static int __devinit pca_isa_probe(struct device *dev, unsigned int id) dev_info(dev, "i/o base %#08lx. irq %d\n", base, irq); -#ifdef CONFIG_PPC_MERGE +#ifdef CONFIG_PPC if (check_legacy_ioport(base)) { dev_err(dev, "I/O address %#08lx is not available\n", base); goto out; |