Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 68e1ee62 authored Sep 22, 2008 by Kumar Gala

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>

parent 1e16dfc1

drivers/block/floppy.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -4165,7 +4165,7 @@ static int __init floppy_init(void)
	int i, unit, drive;		int i, unit, drive;
	int err, dr;		int err, dr;

	#if defined(CONFIG_PPC_MERGE)		#if defined(CONFIG_PPC)
	if (check_legacy_ioport(FDC1))		if (check_legacy_ioport(FDC1))
	return -ENODEV;		return -ENODEV;
	#endif		#endif

drivers/char/ipmi/ipmi_si_intf.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -2695,7 +2695,7 @@ static __devinit void default_find_bmc(void)
	for (i = 0; ; i++) {		for (i = 0; ; i++) {
	if (!ipmi_defaults[i].port)		if (!ipmi_defaults[i].port)
	break;		break;
	#ifdef CONFIG_PPC_MERGE		#ifdef CONFIG_PPC
	if (check_legacy_ioport(ipmi_defaults[i].port))		if (check_legacy_ioport(ipmi_defaults[i].port))
	continue;		continue;
	#endif		#endif

drivers/i2c/busses/i2c-pca-isa.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -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);		dev_info(dev, "i/o base %#08lx. irq %d\n", base, irq);

	#ifdef CONFIG_PPC_MERGE		#ifdef CONFIG_PPC
	if (check_legacy_ioport(base)) {		if (check_legacy_ioport(base)) {
	dev_err(dev, "I/O address %#08lx is not available\n", base);		dev_err(dev, "I/O address %#08lx is not available\n", base);
	goto out;		goto out;

drivers/input/serio/i8042-io.h

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -67,7 +67,7 @@ static inline int i8042_platform_init(void)
	* On some platforms touching the i8042 data register region can do really		* 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.		* 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))		if (check_legacy_ioport(I8042_DATA_REG))
	return -ENODEV;		return -ENODEV;
	#endif		#endif

drivers/pnp/isapnp/core.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1012,7 +1012,7 @@ static int __init isapnp_init(void)
	printk(KERN_INFO "isapnp: ISA Plug & Play support disabled\n");		printk(KERN_INFO "isapnp: ISA Plug & Play support disabled\n");
	return 0;		return 0;
	}		}
	#ifdef CONFIG_PPC_MERGE		#ifdef CONFIG_PPC
	if (check_legacy_ioport(_PIDXR) \|\| check_legacy_ioport(_PNPWRP))		if (check_legacy_ioport(_PIDXR) \|\| check_legacy_ioport(_PNPWRP))
	return -EINVAL;		return -EINVAL;
	#endif		#endif