diff options
author | Ingo Molnar <mingo@elte.hu> | 2011-04-19 01:55:58 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2011-04-19 01:56:17 -0400 |
commit | 68d2cf25d39324c54b5e42de7915c623a0917abe (patch) | |
tree | ff1291450d7e6630bc77ec1363c3db8d74fa58b0 /arch/m68k/q40/README | |
parent | 176fcc5c5f0131504a55e1e1d35389c49a9177c2 (diff) | |
parent | 5d2cd90922c778908bd0cd669e572a5b5eafd737 (diff) |
Merge branch 'perf/urgent' into perf/core
Merge reason: we'll be queueing up dependent changes.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/m68k/q40/README')
-rw-r--r-- | arch/m68k/q40/README | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/m68k/q40/README b/arch/m68k/q40/README index f877b7249790..b26d5f55e91d 100644 --- a/arch/m68k/q40/README +++ b/arch/m68k/q40/README | |||
@@ -89,7 +89,7 @@ The main interrupt register IIRQ_REG will indicate whether an IRQ was internal | |||
89 | or from some ISA devices, EIRQ_REG can distinguish up to 8 ISA IRQs. | 89 | or from some ISA devices, EIRQ_REG can distinguish up to 8 ISA IRQs. |
90 | 90 | ||
91 | The Q40 custom chip is programmable to provide 2 periodic timers: | 91 | The Q40 custom chip is programmable to provide 2 periodic timers: |
92 | - 50 or 200 Hz - level 2, !!THIS CANT BE DISABLED!! | 92 | - 50 or 200 Hz - level 2, !!THIS CAN'T BE DISABLED!! |
93 | - 10 or 20 KHz - level 4, used for dma-sound | 93 | - 10 or 20 KHz - level 4, used for dma-sound |
94 | 94 | ||
95 | Linux uses the 200 Hz interrupt for timer and beep by default. | 95 | Linux uses the 200 Hz interrupt for timer and beep by default. |