projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-nmw
[cascardo/linux.git]
/
drivers
/
mfd
/
omap-usb-tll.c
diff --git
a/drivers/mfd/omap-usb-tll.c
b/drivers/mfd/omap-usb-tll.c
index
401b976
..
eb86915
100644
(file)
--- a/
drivers/mfd/omap-usb-tll.c
+++ b/
drivers/mfd/omap-usb-tll.c
@@
-25,8
+25,8
@@
#include <linux/clk.h>
#include <linux/io.h>
#include <linux/err.h>
-#include <plat/usb.h>
#include <linux/pm_runtime.h>
+#include <linux/platform_data/usb-omap.h>
#define USBTLL_DRIVER_NAME "usbhs_tll"