projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'gfs2-merge-window' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2...
[cascardo/linux.git]
/
arch
/
arm
/
plat-samsung
/
devs.c
diff --git
a/arch/arm/plat-samsung/devs.c
b/arch/arm/plat-samsung/devs.c
index
83c7d15
..
8207462
100644
(file)
--- a/
arch/arm/plat-samsung/devs.c
+++ b/
arch/arm/plat-samsung/devs.c
@@
-1042,11
+1042,11
@@
struct platform_device s3c_device_usb_hsotg = {
},
};
},
};
-void __init
s3c_hsotg_set_platdata(struct s3c
_hsotg_plat *pd)
+void __init
dwc2_hsotg_set_platdata(struct dwc2
_hsotg_plat *pd)
{
{
- struct
s3c
_hsotg_plat *npd;
+ struct
dwc2
_hsotg_plat *npd;
- npd = s3c_set_platdata(pd, sizeof(struct
s3c
_hsotg_plat),
+ npd = s3c_set_platdata(pd, sizeof(struct
dwc2
_hsotg_plat),
&s3c_device_usb_hsotg);
if (!npd->phy_init)
&s3c_device_usb_hsotg);
if (!npd->phy_init)