summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorRussell King <rmk@flint.arm.linux.org.uk>2003-02-01 17:51:52 +0000
committerRussell King <rmk@flint.arm.linux.org.uk>2003-02-01 17:51:52 +0000
commit78a93c96accee297251f9aed06f3c936c508cdcc (patch)
tree61bc14ab31254d0b936de7eefcb20b3607675792 /include
parenta04d2bdfed842189078523eb59ffd4bba44a62a6 (diff)
[ARM] Remove IRQ desc->enabled in favour of testing disable_depth
Diffstat (limited to 'include')
-rw-r--r--include/asm-arm/mach/irq.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/include/asm-arm/mach/irq.h b/include/asm-arm/mach/irq.h
index 60ce4643c027..5a3007b97324 100644
--- a/include/asm-arm/mach/irq.h
+++ b/include/asm-arm/mach/irq.h
@@ -50,8 +50,8 @@ struct irqdesc {
irq_handler_t handle;
struct irqchip *chip;
struct irqaction *action;
+ unsigned int disable_depth;
- unsigned int enabled : 1; /* IRQ is currently enabled */
unsigned int triggered: 1; /* IRQ has occurred */
unsigned int running : 1; /* IRQ is running */
unsigned int pending : 1; /* IRQ is pending */
@@ -59,8 +59,7 @@ struct irqdesc {
unsigned int probe_ok : 1; /* IRQ can be used for probe */
unsigned int valid : 1; /* IRQ claimable */
unsigned int noautoenable : 1; /* don't automatically enable IRQ */
- unsigned int unused :23;
- unsigned int depth; /* disable depth */
+ unsigned int unused :25;
/*
* IRQ lock detection