aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--arch/powerpc/platforms/pseries/setup.c6
-rw-r--r--drivers/parport/parport_pc.c4
-rw-r--r--include/asm-powerpc/io.h1
3 files changed, 0 insertions, 11 deletions
diff --git a/arch/powerpc/platforms/pseries/setup.c b/arch/powerpc/platforms/pseries/setup.c
index 98189d8efac..4f0097f31bd 100644
--- a/arch/powerpc/platforms/pseries/setup.c
+++ b/arch/powerpc/platforms/pseries/setup.c
@@ -415,12 +415,6 @@ static int pSeries_check_legacy_ioport(unsigned int baseport)
return -ENODEV;
of_node_put(np);
break;
- case PARALLEL_BASE:
- np = of_find_node_by_type(NULL, "parallel");
- if (np == NULL)
- return -ENODEV;
- of_node_put(np);
- break;
}
return 0;
}
diff --git a/drivers/parport/parport_pc.c b/drivers/parport/parport_pc.c
index 43894ddec7d..fe800dc0be9 100644
--- a/drivers/parport/parport_pc.c
+++ b/drivers/parport/parport_pc.c
@@ -3374,10 +3374,6 @@ __setup("parport_init_mode=",parport_init_mode_setup);
static int __init parport_pc_init(void)
{
-#if defined(CONFIG_PPC_MERGE)
- if (check_legacy_ioport(PARALLEL_BASE))
- return -ENODEV;
-#endif
if (parse_parport_params())
return -EINVAL;
diff --git a/include/asm-powerpc/io.h b/include/asm-powerpc/io.h
index 19b2ec1ec66..cbbd8c648df 100644
--- a/include/asm-powerpc/io.h
+++ b/include/asm-powerpc/io.h
@@ -11,7 +11,6 @@
/* Check of existence of legacy devices */
extern int check_legacy_ioport(unsigned long base_port);
-#define PARALLEL_BASE 0x378
#define PNPBIOS_BASE 0xf000 /* only relevant for PReP */
#ifndef CONFIG_PPC64