Merge branch 'master' into for-next

[mirror_ubuntu-bionic-kernel.git] / kernel / irq / manage.c

diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c
index 67ce837ae52cdd70115a8ce436f923e96a26adc4..63c16254e449060eec92c22e4167e1d7faccd4c3 100644 (file)
--- a/kernel/irq/manage.c
+++ b/kernel/irq/manage.c
@@ -1289,7 +1289,7 @@ EXPORT_SYMBOL(free_irq);
  *     and to set up the interrupt handler in the right order.
  *
  *     If you want to set up a threaded irq handler for your device
- *     then you need to supply @handler and @thread_fn. @handler ist
+ *     then you need to supply @handler and @thread_fn. @handler is
  *     still called in hard interrupt context and has to check
  *     whether the interrupt originates from the device. If yes it
  *     needs to disable the interrupt on the device and return