powerpc: convert CONFIG_PPC_MERGE to CONFIG_PPC for legacy io checks
Subsystems (7)
PATCH 1/1 powerpc: convert CONFIG_PPC_MERGE to CONFIG_PPC for legacy io checks
From: Kumar Gala <[email protected]>
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 <[email protected]>
Cc Benjamin Herrenschmidt <[email protected]>
Cc Paul Mackerras <[email protected]>
Signed-off-by Andrew Morton <[email protected]>
---
drivers/block/floppy.c | 2 +- drivers/char/ipmi/ipmi_si_intf.c | 2 +- drivers/i2c/busses/i2c-pca-isa.c | 2 +- drivers/input/serio/i8042-io.h | 2 +- drivers/pnp/isapnp/core.c | 2 +- drivers/pnp/pnpbios/core.c | 4 ++-- 6 files changed, 7 insertions(+), 7 deletions(-)
drivers/block/floppy.c renamed from drivers/block/floppy.c~powerpc-convert-config_ppc_merge-to-config_ppc-for-legacy-io-checks +1 -1
@@ -4165,7 +4165,7 @@ static int __init floppy_init(void)int i, unit, drive;int err, dr; -#if defined(CONFIG_PPC_MERGE ) +#if defined(CONFIG_PPC )if (check_legacy_ioport (FDC1 ))return -ENODEV ;#endif
drivers/char/ipmi/ipmi_si_intf.c renamed from drivers/char/ipmi/ipmi_si_intf.c~powerpc-convert-config_ppc_merge-to-config_ppc-for-legacy-io-checks +1 -1
@@ -2695,7 +2695,7 @@ static __devinit void default_find_bmc(vfor (i =0 ; ; i++) {if (!ipmi_defaults[i].port)break ; -#ifdef CONFIG_PPC_MERGE +#ifdef CONFIG_PPC if (check_legacy_ioport (ipmi_defaults[i].port))continue ;#endif
drivers/i2c/busses/i2c-pca-isa.c renamed from drivers/i2c/busses/i2c-pca-isa.c~powerpc-convert-config_ppc_merge-to-config_ppc-for-legacy-io-checks +1 -1
@@ -126,7 +126,7 @@ static int __devinit pca_isa_probe(strucdev_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;
drivers/input/serio/i8042-io.h renamed from drivers/input/serio/i8042-io.h~powerpc-convert-config_ppc_merge-to-config_ppc-for-legacy-io-checks +1 -1
@@ -67,7 +67,7 @@ static inline int i8042_platform_init(vo* On some platforms touching the i8042 data register region can do really * bad things. Because of this the region is always reserved on such boxes. */ -#if defined(CONFIG_PPC_MERGE ) +#if defined(CONFIG_PPC )if (check_legacy_ioport (I8042_DATA_REG ))return -ENODEV ;#endif
drivers/pnp/isapnp/core.c renamed from drivers/pnp/isapnp/core.c~powerpc-convert-config_ppc_merge-to-config_ppc-for-legacy-io-checks +1 -1
@@ -1012,7 +1012,7 @@ static int __init isapnp_init(void)printk (KERN_INFO "isapnp: ISA Plug & Play support disabled\n" );return 0 ; } -#ifdef CONFIG_PPC_MERGE +#ifdef CONFIG_PPC if (check_legacy_ioport (_PIDXR) ||check_legacy_ioport (_PNPWRP))return -EINVAL ;#endif
drivers/pnp/pnpbios/core.c renamed from drivers/pnp/pnpbios/core.c~powerpc-convert-config_ppc_merge-to-config_ppc-for-legacy-io-checks +2 -2
@@ -519,7 +519,7 @@ static int __init pnpbios_init(void) {int ret; -#if defined(CONFIG_PPC_MERGE ) +#if defined(CONFIG_PPC )if (check_legacy_ioport (PNPBIOS_BASE ))return -ENODEV ;#endif
@@ -577,7 +577,7 @@ static int __init pnpbios_thread_init(vo {struct task_struct *task; -#if defined(CONFIG_PPC_MERGE ) +#if defined(CONFIG_PPC )if (check_legacy_ioport (PNPBIOS_BASE ))return 0 ;#endif
_
Quoted 7 lines · On Mon, 2008-09-22 at 14:41 -0700, [email protected] wrote:
From: Kumar Gala <[email protected]>
Now that
arch/ppcis deadCONFIG_PPC_MERGEis always defined for all powerpc platforms and we want to get rid ofCONFIG_PPC_MERGEuseCONFIG_PPCinstead.Signed-off-by Kumar Gala <[email protected]>
Quoted 3 lines
Cc Paul Mackerras <[email protected]>Signed-off-by Andrew Morton <[email protected]>---