diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-03 20:21:05 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-03 20:21:05 -0400 |
| commit | 0a6ba092d1c8c75ae0c0617ef7f4e6f5043af311 (patch) | |
| tree | 9a9afdaf58ab356aa457b6f5c8a2e80c85762901 /drivers | |
| parent | 65e62b502bdaee37b6ea57edc3bb0df2ad1cb858 (diff) | |
| parent | 13176a89e1c4a0011bd9f576730b0338ecb619ff (diff) | |
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
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/mfd/omap-usb-host.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/mfd/omap-usb-host.c b/drivers/mfd/omap-usb-host.c index c8aae6640e64..7e96bb229724 100644 --- a/drivers/mfd/omap-usb-host.c +++ b/drivers/mfd/omap-usb-host.c | |||
| @@ -25,6 +25,7 @@ | |||
| 25 | #include <linux/clk.h> | 25 | #include <linux/clk.h> |
| 26 | #include <linux/dma-mapping.h> | 26 | #include <linux/dma-mapping.h> |
| 27 | #include <linux/spinlock.h> | 27 | #include <linux/spinlock.h> |
| 28 | #include <plat/cpu.h> | ||
| 28 | #include <plat/usb.h> | 29 | #include <plat/usb.h> |
| 29 | #include <linux/pm_runtime.h> | 30 | #include <linux/pm_runtime.h> |
| 30 | 31 | ||