Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 19e0bafc authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents ed72a3d1 6aec187a

drivers/hwspinlock/u8500_hsem.c

+1 −0
Original line number Diff line number Diff line
@@ -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>

drivers/media/video/s5k6aa.c

+1 −0
Original line number Diff line number Diff line
@@ -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>

drivers/mfd/ab5500-core.c

+1 −0
Original line number Diff line number Diff line
@@ -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>

drivers/mfd/ab5500-debugfs.c

+1 −0
Original line number Diff line number Diff line
@@ -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>

drivers/mtd/maps/bcm963xx-flash.c

+1 −0
Original line number Diff line number Diff line
@@ -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>