diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-08 18:34:16 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-08 18:34:16 -0800 |
| commit | 19e0bafc36abd84a5b4d7c7745b78a6f4626e944 (patch) | |
| tree | 03de585a0d840db316bcd93eca8882a920ae6c70 | |
| parent | ed72a3d1b4acb8ace77a1049fbbcbc7edb035267 (diff) | |
| parent | 6aec187a90aeb883533c9180e2acac1e54c87f7d (diff) | |
| download | linux-3.10-19e0bafc36abd84a5b4d7c7745b78a6f4626e944.tar.gz linux-3.10-19e0bafc36abd84a5b4d7c7745b78a6f4626e944.tar.bz2 linux-3.10-19e0bafc36abd84a5b4d7c7745b78a6f4626e944.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux:
drivers/media: video/a5k6aa is a module and so needs module.h
mfd: fix build failures in recently added ab5500 code
hwspinlock/u8500: include linux/module.h
MTD: MAPS: bcm963xx-flash.c: explicitly include module.h
| -rw-r--r-- | drivers/hwspinlock/u8500_hsem.c | 1 | ||||
| -rw-r--r-- | drivers/media/video/s5k6aa.c | 1 | ||||
| -rw-r--r-- | drivers/mfd/ab5500-core.c | 1 | ||||
| -rw-r--r-- | drivers/mfd/ab5500-debugfs.c | 1 | ||||
| -rw-r--r-- | drivers/mtd/maps/bcm963xx-flash.c | 1 |
5 files changed, 5 insertions, 0 deletions
diff --git a/drivers/hwspinlock/u8500_hsem.c b/drivers/hwspinlock/u8500_hsem.c index a120f14814f..86980fe0411 100644 --- a/drivers/hwspinlock/u8500_hsem.c +++ b/drivers/hwspinlock/u8500_hsem.c @@ -21,6 +21,7 @@ * General Public License for more details. */ +#include <linux/module.h> #include <linux/delay.h> #include <linux/io.h> #include <linux/pm_runtime.h> diff --git a/drivers/media/video/s5k6aa.c b/drivers/media/video/s5k6aa.c index 2446736b787..0df7f2a4181 100644 --- a/drivers/media/video/s5k6aa.c +++ b/drivers/media/video/s5k6aa.c @@ -19,6 +19,7 @@ #include <linux/gpio.h> #include <linux/i2c.h> #include <linux/media.h> +#include <linux/module.h> #include <linux/regulator/consumer.h> #include <linux/slab.h> diff --git a/drivers/mfd/ab5500-core.c b/drivers/mfd/ab5500-core.c index 4175544b491..ec10629a0b0 100644 --- a/drivers/mfd/ab5500-core.c +++ b/drivers/mfd/ab5500-core.c @@ -13,6 +13,7 @@ * TODO: Event handling with irq_chip. Waiting for PRCMU fw support. */ +#include <linux/module.h> #include <linux/mutex.h> #include <linux/err.h> #include <linux/platform_device.h> diff --git a/drivers/mfd/ab5500-debugfs.c b/drivers/mfd/ab5500-debugfs.c index 6be1fe6b5f9..43c0ebb8195 100644 --- a/drivers/mfd/ab5500-debugfs.c +++ b/drivers/mfd/ab5500-debugfs.c @@ -4,6 +4,7 @@ * Debugfs support for the AB5500 MFD driver */ +#include <linux/export.h> #include <linux/debugfs.h> #include <linux/seq_file.h> #include <linux/mfd/ab5500/ab5500.h> diff --git a/drivers/mtd/maps/bcm963xx-flash.c b/drivers/mtd/maps/bcm963xx-flash.c index 608967fe74c..736ca10ca9f 100644 --- a/drivers/mtd/maps/bcm963xx-flash.c +++ b/drivers/mtd/maps/bcm963xx-flash.c @@ -21,6 +21,7 @@ #include <linux/init.h> #include <linux/kernel.h> #include <linux/slab.h> +#include <linux/module.h> #include <linux/mtd/map.h> #include <linux/mtd/mtd.h> #include <linux/mtd/partitions.h> |