Merge branch 'core-rcu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[~andy/linux] / arch / arm / mach-exynos / setup-usb-phy.c

diff --git a/arch/arm/mach-exynos/setup-usb-phy.c b/arch/arm/mach-exynos/setup-usb-phy.c
index b81cc569a8ddab4e7a247752297b1b4fac732542..6af40662a4495691da35dda9d267b485387cfe43 100644 (file)
--- a/arch/arm/mach-exynos/setup-usb-phy.c
+++ b/arch/arm/mach-exynos/setup-usb-phy.c
@@ -204,9 +204,9 @@ static int exynos4210_usb_phy1_exit(struct platform_device *pdev)
 
 int s5p_usb_phy_init(struct platform_device *pdev, int type)
 {
-       if (type == S5P_USB_PHY_DEVICE)
+       if (type == USB_PHY_TYPE_DEVICE)
                return exynos4210_usb_phy0_init(pdev);
-       else if (type == S5P_USB_PHY_HOST)
+       else if (type == USB_PHY_TYPE_HOST)
                return exynos4210_usb_phy1_init(pdev);
 
        return -EINVAL;
@@ -214,9 +214,9 @@ int s5p_usb_phy_init(struct platform_device *pdev, int type)
 
 int s5p_usb_phy_exit(struct platform_device *pdev, int type)
 {
-       if (type == S5P_USB_PHY_DEVICE)
+       if (type == USB_PHY_TYPE_DEVICE)
                return exynos4210_usb_phy0_exit(pdev);
-       else if (type == S5P_USB_PHY_HOST)
+       else if (type == USB_PHY_TYPE_HOST)
                return exynos4210_usb_phy1_exit(pdev);
 
        return -EINVAL;