From: Ingo Molnar <mingo@kernel.org>
Date: Tue, 7 Apr 2015 14:07:04 +0000 (+0200)
Subject: manual merge of irq/core
X-Git-Tag: KARO-TXA5-2015-06-26~56^2~20
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=2196762e66e5ddb54f9e7596d30f254e0586fabb;p=karo-tx-linux.git

manual merge of irq/core

Signed-off-by: Ingo Molnar <mingo@kernel.org>
---

2196762e66e5ddb54f9e7596d30f254e0586fabb
diff --cc include/linux/interrupt.h
index 2e88580194f0,2cee1761c77d..150dde04cf4f
--- a/include/linux/interrupt.h
+++ b/include/linux/interrupt.h
@@@ -59,12 -55,7 +57,11 @@@
   * IRQF_NO_THREAD - Interrupt cannot be threaded
   * IRQF_EARLY_RESUME - Resume IRQ early during syscore instead of at device
   *                resume time.
 + * IRQF_COND_SUSPEND - If the IRQ is shared with a NO_SUSPEND user, execute this
 + *                interrupt handler after suspending interrupts. For system
 + *                wakeup devices users need to implement wakeup detection in
 + *                their interrupt handlers.
   */
- #define IRQF_DISABLED		0x00000020
  #define IRQF_SHARED		0x00000080
  #define IRQF_PROBE_SHARED	0x00000100
  #define __IRQF_TIMER		0x00000200