Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 19e0bafc36abd84a5b4d7c7745b78a6f4626e944

Authored by Linus Torvalds
2 parents ed72a3d1b4 6aec187a90
Exists in master and in 6 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

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

Showing 5 changed files Side-by-side Diff

drivers/hwspinlock/u8500_hsem.c
Diff comments   View file @ 19e0baf
... ... @@ -21,6 +21,7 @@
21 21 * General Public License for more details.
22 22 */
23 23  
  24 +#include <linux/module.h>
24 25 #include <linux/delay.h>
25 26 #include <linux/io.h>
26 27 #include <linux/pm_runtime.h>
drivers/media/video/s5k6aa.c
Diff comments   View file @ 19e0baf
... ... @@ -19,6 +19,7 @@
19 19 #include <linux/gpio.h>
20 20 #include <linux/i2c.h>
21 21 #include <linux/media.h>
  22 +#include <linux/module.h>
22 23 #include <linux/regulator/consumer.h>
23 24 #include <linux/slab.h>
24 25  
drivers/mfd/ab5500-core.c
Diff comments   View file @ 19e0baf
... ... @@ -13,6 +13,7 @@
13 13 * TODO: Event handling with irq_chip. Waiting for PRCMU fw support.
14 14 */
15 15  
  16 +#include <linux/module.h>
16 17 #include <linux/mutex.h>
17 18 #include <linux/err.h>
18 19 #include <linux/platform_device.h>
drivers/mfd/ab5500-debugfs.c
Diff comments   View file @ 19e0baf
... ... @@ -4,6 +4,7 @@
4 4 * Debugfs support for the AB5500 MFD driver
5 5 */
6 6  
  7 +#include <linux/export.h>
7 8 #include <linux/debugfs.h>
8 9 #include <linux/seq_file.h>
9 10 #include <linux/mfd/ab5500/ab5500.h>
drivers/mtd/maps/bcm963xx-flash.c
Diff comments   View file @ 19e0baf
... ... @@ -21,6 +21,7 @@
21 21 #include <linux/init.h>
22 22 #include <linux/kernel.h>
23 23 #include <linux/slab.h>
  24 +#include <linux/module.h>
24 25 #include <linux/mtd/map.h>
25 26 #include <linux/mtd/mtd.h>
26 27 #include <linux/mtd/partitions.h>