Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/pcmcia/o2micro.h b/drivers/pcmcia/o2micro.h
index e74bebac2695..5096e92c7a4c 100644
--- a/drivers/pcmcia/o2micro.h
+++ b/drivers/pcmcia/o2micro.h
@@ -153,14 +153,14 @@ static int o2micro_override(struct yenta_socket *socket)
 
                 if (use_speedup) {
                         dev_info(&socket->dev->dev,
-                                "O2: enabling read prefetch/write burst\n");
+                                "O2: enabling read prefetch/write burst. If you experience problems or performance issues, use the yenta_socket parameter 'o2_speedup=off'\n");
                         config_writeb(socket, O2_RESERVED1,
                                       a | O2_RES_READ_PREFETCH | O2_RES_WRITE_BURST);
                         config_writeb(socket, O2_RESERVED2,
                                       b | O2_RES_READ_PREFETCH | O2_RES_WRITE_BURST);
                 } else {
                         dev_info(&socket->dev->dev,
-                                "O2: disabling read prefetch/write burst\n");
+                                "O2: disabling read prefetch/write burst. If you experience problems or performance issues, use the yenta_socket parameter 'o2_speedup=on'\n");
                         config_writeb(socket, O2_RESERVED1,
                                       a & ~(O2_RES_READ_PREFETCH | O2_RES_WRITE_BURST));
                         config_writeb(socket, O2_RESERVED2,