aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/char/scc.h
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-02-24 18:22:39 +0100
committerIngo Molnar <mingo@elte.hu>2009-02-24 18:22:39 +0100
commita7f4463e0300b5135c0f0caf7c34a0529405f986 (patch)
tree8df5f13094778eff3c8653bcc249cd265378b80a /drivers/char/scc.h
parentc478f8786973d6d7552c652ddad3f6fd86b5af28 (diff)
parent20f4d6c3a2a23c5d7d9cc7f42fbb943ca7a03d1f (diff)
downloadkernel_samsung_aries-a7f4463e0300b5135c0f0caf7c34a0529405f986.zip
kernel_samsung_aries-a7f4463e0300b5135c0f0caf7c34a0529405f986.tar.gz
kernel_samsung_aries-a7f4463e0300b5135c0f0caf7c34a0529405f986.tar.bz2
Merge branch 'tracing/ftrace'; commit 'v2.6.29-rc6' into tracing/core
Diffstat (limited to 'drivers/char/scc.h')
-rw-r--r--drivers/char/scc.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/scc.h b/drivers/char/scc.h
index 93998f5..341b114 100644
--- a/drivers/char/scc.h
+++ b/drivers/char/scc.h
@@ -387,7 +387,7 @@ struct scc_port {
/* The SCC needs 3.5 PCLK cycles recovery time between to register
* accesses. PCLK runs with 8 MHz on an Atari, so this delay is 3.5 *
* 125 ns = 437.5 ns. This is too short for udelay().
- * 10/16/95: A tstb mfp.par_dt_reg takes 600ns (sure?) and thus should be
+ * 10/16/95: A tstb st_mfp.par_dt_reg takes 600ns (sure?) and thus should be
* quite right
*/