This driver contains a check for CONFIG_M32RPCC_SLOT2 ever since it was
added in v2.6.10 it. But there's no matching Kconfig symbol. Remove
that check. But leave the second call of add_pcc_socket() if-zeroed out.
The code clearly is written to be able handle two sockets. It's just not
clear if it is always safe to do that. Add a comment to clarify this
decision.
Signed-off-by: Paul Bolle <pebo...@tiscali.nl>
---
Untested.
Pet peeve: the code has module support, but M32R_PCC is bool!
drivers/pcmcia/m32r_pcc.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/pcmcia/m32r_pcc.c b/drivers/pcmcia/m32r_pcc.c
index 296514155cd5..a86ada82b61c 100644
--- a/drivers/pcmcia/m32r_pcc.c
+++ b/drivers/pcmcia/m32r_pcc.c
@@ -695,7 +695,7 @@ static int __init init_m32r_pcc(void)
add_pcc_socket(M32R_PCC0_BASE, PCC0_IRQ, M32R_PCC0_MAPBASE, 0x1000);
-#ifdef CONFIG_M32RPCC_SLOT2
+#if 0 /* XXX In what cases is it OK to do this? */
add_pcc_socket(M32R_PCC1_BASE, PCC1_IRQ, M32R_PCC1_MAPBASE, 0x2000);
#endif
--
1.9.0
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
