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
This commit is contained in:
Linus Torvalds
2011-11-08 18:34:16 -08:00
5 changed files with 5 additions and 0 deletions

View File

@ -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>