diff options
| author | Mark Brown <broonie@kernel.org> | 2016-05-02 12:02:09 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-05-02 12:02:09 +0100 |
| commit | 0ce8428ba9ea13098b828d0881e28368a108709c (patch) | |
| tree | 12cbe5d9c27319b8a18ac9fc9cb44e3c5f35408c /arch/sparc/kernel/leon_kernel.c | |
| parent | fba0d7066524ab7b8ccf60e7e95981d10ed008b0 (diff) | |
| parent | 8c0f55100478649e3c0133684aa4aebab77ce10f (diff) | |
Merge tag 'asoc-fix-v4.6-rc5' into asoc-intel
ASoC: Fixes for v4.6
This is a fairly large collection of fixes but almost all driver
specific ones, especially to the new Intel drivers which have had a lot
of recent development. The one core fix is a change to the debugfs code
to avoid crashes in some relatively unusual configurations.
Diffstat (limited to 'arch/sparc/kernel/leon_kernel.c')
| -rw-r--r-- | arch/sparc/kernel/leon_kernel.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sparc/kernel/leon_kernel.c b/arch/sparc/kernel/leon_kernel.c index 42efcf85f721..33cd171d933e 100644 --- a/arch/sparc/kernel/leon_kernel.c +++ b/arch/sparc/kernel/leon_kernel.c @@ -203,7 +203,7 @@ static struct irq_chip leon_irq = { /* * Build a LEON IRQ for the edge triggered LEON IRQ controller: - * Edge (normal) IRQ - handle_simple_irq, ack=DONT-CARE, never ack + * Edge (normal) IRQ - handle_simple_irq, ack=DON'T-CARE, never ack * Level IRQ (PCI|Level-GPIO) - handle_fasteoi_irq, ack=1, ack after ISR * Per-CPU Edge - handle_percpu_irq, ack=0 */ |