summaryrefslogtreecommitdiffstats
path: root/drivers/hwspinlock
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-11-08 18:34:16 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2011-11-08 18:34:16 -0800
commit19e0bafc36abd84a5b4d7c7745b78a6f4626e944 (patch)
tree03de585a0d840db316bcd93eca8882a920ae6c70 /drivers/hwspinlock
parented72a3d1b4acb8ace77a1049fbbcbc7edb035267 (diff)
parent6aec187a90aeb883533c9180e2acac1e54c87f7d (diff)
downloadtalos-obmc-linux-19e0bafc36abd84a5b4d7c7745b78a6f4626e944.tar.gz
talos-obmc-linux-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
Diffstat (limited to 'drivers/hwspinlock')
-rw-r--r--drivers/hwspinlock/u8500_hsem.c1
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 @@
* General Public License for more details.
*/
+#include <linux/module.h>
#include <linux/delay.h>
#include <linux/io.h>
#include <linux/pm_runtime.h>
OpenPOWER on IntegriCloud