summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-05-03 17:21:05 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2012-05-03 17:21:05 -0700
commit0a6ba092d1c8c75ae0c0617ef7f4e6f5043af311 (patch)
tree9a9afdaf58ab356aa457b6f5c8a2e80c85762901
parent65e62b502bdaee37b6ea57edc3bb0df2ad1cb858 (diff)
parent13176a89e1c4a0011bd9f576730b0338ecb619ff (diff)
downloadop-kernel-dev-0a6ba092d1c8c75ae0c0617ef7f4e6f5043af311.zip
op-kernel-dev-0a6ba092d1c8c75ae0c0617ef7f4e6f5043af311.tar.gz
Merge tag 'mfd-for-linus-3.4-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6
Pull second set of MFD fixes from Samuel Ortiz: "This time we only have a one liner fixing an omap-usb build error." * tag 'mfd-for-linus-3.4-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6: mfd: Fix build breakage in omap-usb-host.c
-rw-r--r--drivers/mfd/omap-usb-host.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/mfd/omap-usb-host.c b/drivers/mfd/omap-usb-host.c
index c8aae66..7e96bb2 100644
--- a/drivers/mfd/omap-usb-host.c
+++ b/drivers/mfd/omap-usb-host.c
@@ -25,6 +25,7 @@
#include <linux/clk.h>
#include <linux/dma-mapping.h>
#include <linux/spinlock.h>
+#include <plat/cpu.h>
#include <plat/usb.h>
#include <linux/pm_runtime.h>
OpenPOWER on IntegriCloud