Merge remote-tracking branch 'nvdimm/libnvdimm-for-next'

[karo-tx-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 83c7d154bde0971a3b9abeadeb6fb8bfaa93143a..82074625de5cebfc7681f72c931c90d1b7e951ac 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)