diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-08-17 10:23:50 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-08-17 10:23:50 -0700 |
commit | 950d0a10d12578a270f3dfa9fd76fe5c2deb343f (patch) | |
tree | 2467458b05ab13dd8875e43f3701fbc0c38cef0d /include/linux/irqdesc.h | |
parent | ab7e2dbf9b5da4d4eb4fdb019cc8881fbeb1299b (diff) | |
parent | b6873807a7143b7d6d8b06809295e559d07d7deb (diff) |
Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
irq: Track the owner of irq descriptor
irq: Always set IRQF_ONESHOT if no primary handler is specified
genirq: Fix wrong bit operation
Diffstat (limited to 'include/linux/irqdesc.h')
-rw-r--r-- | include/linux/irqdesc.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/irqdesc.h b/include/linux/irqdesc.h index 2d921b35212c..150134ac709a 100644 --- a/include/linux/irqdesc.h +++ b/include/linux/irqdesc.h @@ -66,6 +66,7 @@ struct irq_desc { #ifdef CONFIG_PROC_FS struct proc_dir_entry *dir; #endif + struct module *owner; const char *name; } ____cacheline_internodealigned_in_smp; |