diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-04-17 14:51:47 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-04-17 14:51:47 +0100 |
| commit | 82b719b11fd750188c125078ad6a6c0d23219dfb (patch) | |
| tree | 4f75f1da53a62c82f1e3f5abe0c7992dea85d722 /include/linux/mfd | |
| parent | 575f690dc4973027ce7e93360678681d09f65fac (diff) | |
| download | linux-stable-82b719b11fd750188c125078ad6a6c0d23219dfb.tar.gz linux-stable-82b719b11fd750188c125078ad6a6c0d23219dfb.tar.bz2 linux-stable-82b719b11fd750188c125078ad6a6c0d23219dfb.zip | |
mfd: Revert "mfd: add irq domain support for max8997 interrupts"
This reverts commit 98d8618af37728f6e18e84110ddb99987b47dd12 as it
breaks the build of the muic driver.
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'include/linux/mfd')
| -rw-r--r-- | include/linux/mfd/max8997-private.h | 4 | ||||
| -rw-r--r-- | include/linux/mfd/max8997.h | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/include/linux/mfd/max8997-private.h b/include/linux/mfd/max8997-private.h index 830152cfae33..3f4deb62d6b0 100644 --- a/include/linux/mfd/max8997-private.h +++ b/include/linux/mfd/max8997-private.h @@ -23,8 +23,6 @@ #define __LINUX_MFD_MAX8997_PRIV_H #include <linux/i2c.h> -#include <linux/export.h> -#include <linux/irqdomain.h> #define MAX8997_REG_INVALID (0xff) @@ -327,7 +325,7 @@ struct max8997_dev { int irq; int ono; - struct irq_domain *irq_domain; + int irq_base; struct mutex irqlock; int irq_masks_cur[MAX8997_IRQ_GROUP_NR]; int irq_masks_cache[MAX8997_IRQ_GROUP_NR]; diff --git a/include/linux/mfd/max8997.h b/include/linux/mfd/max8997.h index 24b1a76540da..28726dd540f2 100644 --- a/include/linux/mfd/max8997.h +++ b/include/linux/mfd/max8997.h @@ -204,6 +204,7 @@ struct max8997_led_platform_data { struct max8997_platform_data { /* IRQ */ + int irq_base; int ono; int wakeup; |