Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

powerpc: convert CONFIG_PPC_MERGE to CONFIG_PPC for legacy io checks

Browse source 
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>
This commit is contained in:
Kumar Gala 2008-09-22 14:41:31 -07:00
parent 1e16dfc1ba
commit 68e1ee62f0
6 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/block/floppy.c
View file

@ -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

2
drivers/char/ipmi/ipmi_si_intf.c
View file

@ -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

2
drivers/i2c/busses/i2c-pca-isa.c
View file

@ -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;

2
drivers/input/serio/i8042-io.h
View file

@ -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

2
drivers/pnp/isapnp/core.c
View file

@ -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

4
drivers/pnp/pnpbios/core.c
View file

@ -519,7 +519,7 @@ static int __init pnpbios_init(void)
{ {
int ret; int ret;
#if defined(CONFIG_PPC_MERGE) #if defined(CONFIG_PPC)
if (check_legacy_ioport(PNPBIOS_BASE)) if (check_legacy_ioport(PNPBIOS_BASE))
return -ENODEV; return -ENODEV;
#endif #endif
@ -577,7 +577,7 @@ static int __init pnpbios_thread_init(void)
{ {
struct task_struct *task; struct task_struct *task;
#if defined(CONFIG_PPC_MERGE) #if defined(CONFIG_PPC)
if (check_legacy_ioport(PNPBIOS_BASE)) if (check_legacy_ioport(PNPBIOS_BASE))
return 0; return 0;
#endif #endif