aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pnp/pnpbios
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/pnp/pnpbios')
-rw-r--r--drivers/pnp/pnpbios/core.c9
1 files changed, 1 insertions, 8 deletions
diff --git a/drivers/pnp/pnpbios/core.c b/drivers/pnp/pnpbios/core.c
index 5d66e5585f97..9b86a01af631 100644
--- a/drivers/pnp/pnpbios/core.c
+++ b/drivers/pnp/pnpbios/core.c
@@ -513,10 +513,6 @@ static int __init pnpbios_init(void)
513{ 513{
514 int ret; 514 int ret;
515 515
516#if defined(CONFIG_PPC)
517 if (check_legacy_ioport(PNPBIOS_BASE))
518 return -ENODEV;
519#endif
520 if (pnpbios_disabled || dmi_check_system(pnpbios_dmi_table) || 516 if (pnpbios_disabled || dmi_check_system(pnpbios_dmi_table) ||
521 paravirt_enabled()) { 517 paravirt_enabled()) {
522 printk(KERN_INFO "PnPBIOS: Disabled\n"); 518 printk(KERN_INFO "PnPBIOS: Disabled\n");
@@ -570,10 +566,7 @@ fs_initcall(pnpbios_init);
570static int __init pnpbios_thread_init(void) 566static int __init pnpbios_thread_init(void)
571{ 567{
572 struct task_struct *task; 568 struct task_struct *task;
573#if defined(CONFIG_PPC) 569
574 if (check_legacy_ioport(PNPBIOS_BASE))
575 return 0;
576#endif
577 if (pnpbios_disabled) 570 if (pnpbios_disabled)
578 return 0; 571 return 0;
579 572