diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-08 21:34:16 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-08 21:34:16 -0500 |
| commit | 19e0bafc36abd84a5b4d7c7745b78a6f4626e944 (patch) | |
| tree | 03de585a0d840db316bcd93eca8882a920ae6c70 /drivers/hwspinlock | |
| parent | ed72a3d1b4acb8ace77a1049fbbcbc7edb035267 (diff) | |
| parent | 6aec187a90aeb883533c9180e2acac1e54c87f7d (diff) | |
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
Diffstat (limited to 'drivers/hwspinlock')
| -rw-r--r-- | drivers/hwspinlock/u8500_hsem.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/hwspinlock/u8500_hsem.c b/drivers/hwspinlock/u8500_hsem.c index a120f14814f9..86980fe04117 100644 --- a/drivers/hwspinlock/u8500_hsem.c +++ b/drivers/hwspinlock/u8500_hsem.c | |||
| @@ -21,6 +21,7 @@ | |||
| 21 | * General Public License for more details. | 21 | * General Public License for more details. |
| 22 | */ | 22 | */ |
| 23 | 23 | ||
| 24 | #include <linux/module.h> | ||
| 24 | #include <linux/delay.h> | 25 | #include <linux/delay.h> |
| 25 | #include <linux/io.h> | 26 | #include <linux/io.h> |
| 26 | #include <linux/pm_runtime.h> | 27 | #include <linux/pm_runtime.h> |