aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars-Peter Clausen <lars@metafoo.de>2010-01-17 18:07:08 +0100
committerLars-Peter Clausen <lars@metafoo.de>2010-01-17 18:07:08 +0100
commit5827b20d022fb47ce9c9731d0fb894d361e16ffe (patch)
tree995409d31ba3bb2e94c6b9975ae9c37d623f2b20
parent126f172b476592064ec3f8c345df4dad52df2495 (diff)
parenta6f4241642797078c36609d2e3b53aaf37f26b72 (diff)
Merge branch 'glamo-2.6.32' into om-gta02-2.6.32
-rw-r--r--drivers/mfd/glamo/glamo-core.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/mfd/glamo/glamo-core.h b/drivers/mfd/glamo/glamo-core.h
index e5b1a35518a..17017b03fb5 100644
--- a/drivers/mfd/glamo/glamo-core.h
+++ b/drivers/mfd/glamo/glamo-core.h
@@ -37,6 +37,7 @@ struct glamo_core {
struct glamo_platform_data *pdata;
enum glamo_engine_state engine_state[__NUM_GLAMO_ENGINES];
spinlock_t lock;
+ uint16_t saved_irq_mask;
};
struct glamo_script {