diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-12-21 18:28:52 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-12-21 18:28:52 -0800 |
| commit | 0703c680f62cb210fecf24684cc1c6a70c26c899 (patch) | |
| tree | 3ba1f520d41a5bb64c0cd9b62ca456ac378b85ef /drivers/mfd/jz4740-adc.c | |
| parent | e6f67b8c05f5e129e126f4409ddac6f25f58ffcb (diff) | |
| parent | fa860403e61cf5201e2f03b726aa53c30ae9a659 (diff) | |
| download | op-kernel-dev-0703c680f62cb210fecf24684cc1c6a70c26c899.zip op-kernel-dev-0703c680f62cb210fecf24684cc1c6a70c26c899.tar.gz | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6:
mfd: Include linux/io.h to jz4740-adc
mfd: Use request_threaded_irq for twl4030-irq instead of irq_set_chained_handler
mfd: Base interrupt for twl4030-irq must be one-shot
mfd: Handle tps65910 clear-mask correctly
mfd: add #ifdef CONFIG_DEBUG_FS guard for ab8500_debug_resources
mfd: Fix twl-core oops while calling twl_i2c_* for unbound driver
mfd: include linux/module.h for ab5500-debugfs
mfd: Update wm8994 active device checks for WM1811
mfd: Set tps6586x bits if new value is different from the old one
mfd: Set da903x bits if new value is different from the old one
mfd: Set adp5520 bits if new value is different from the old one
mfd: Add missed free_irq in da903x_remove
Diffstat (limited to 'drivers/mfd/jz4740-adc.c')
| -rw-r--r-- | drivers/mfd/jz4740-adc.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/mfd/jz4740-adc.c b/drivers/mfd/jz4740-adc.c index 1e9ee53..ef39528 100644 --- a/drivers/mfd/jz4740-adc.c +++ b/drivers/mfd/jz4740-adc.c @@ -16,6 +16,7 @@ */ #include <linux/err.h> +#include <linux/io.h> #include <linux/irq.h> #include <linux/interrupt.h> #include <linux/kernel.h> |
