diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-09-03 16:38:52 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-09-03 16:38:52 -0400 |
| commit | 68885a3ff38ed51fa02f241feb405c9922a90ee0 (patch) | |
| tree | 2fc626df39d5e0e1f6b065238141f7d49187c737 /arch/arm/mach-imx | |
| parent | 7b28079b3284ccb15ad4f003fb7073890600d0c1 (diff) | |
| parent | a2acad8298a42b7be684a32fafaf83332bba9c2b (diff) | |
Merge branch 'fix/misc' into topic/misc
Diffstat (limited to 'arch/arm/mach-imx')
| -rw-r--r-- | arch/arm/mach-imx/mach-cpuimx27.c | 4 | ||||
| -rw-r--r-- | arch/arm/mach-imx/mach-pca100.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-imx/mach-cpuimx27.c b/arch/arm/mach-imx/mach-cpuimx27.c index 575ff1ae85a7..339150ab0ea5 100644 --- a/arch/arm/mach-imx/mach-cpuimx27.c +++ b/arch/arm/mach-imx/mach-cpuimx27.c | |||
| @@ -279,13 +279,13 @@ static void __init eukrea_cpuimx27_init(void) | |||
| 279 | #if defined(CONFIG_USB_ULPI) | 279 | #if defined(CONFIG_USB_ULPI) |
| 280 | if (otg_mode_host) { | 280 | if (otg_mode_host) { |
| 281 | otg_pdata.otg = otg_ulpi_create(&mxc_ulpi_access_ops, | 281 | otg_pdata.otg = otg_ulpi_create(&mxc_ulpi_access_ops, |
| 282 | USB_OTG_DRV_VBUS | USB_OTG_DRV_VBUS_EXT); | 282 | ULPI_OTG_DRVVBUS | ULPI_OTG_DRVVBUS_EXT); |
| 283 | 283 | ||
| 284 | mxc_register_device(&mxc_otg_host, &otg_pdata); | 284 | mxc_register_device(&mxc_otg_host, &otg_pdata); |
| 285 | } | 285 | } |
| 286 | 286 | ||
| 287 | usbh2_pdata.otg = otg_ulpi_create(&mxc_ulpi_access_ops, | 287 | usbh2_pdata.otg = otg_ulpi_create(&mxc_ulpi_access_ops, |
| 288 | USB_OTG_DRV_VBUS | USB_OTG_DRV_VBUS_EXT); | 288 | ULPI_OTG_DRVVBUS | ULPI_OTG_DRVVBUS_EXT); |
| 289 | 289 | ||
| 290 | mxc_register_device(&mxc_usbh2, &usbh2_pdata); | 290 | mxc_register_device(&mxc_usbh2, &usbh2_pdata); |
| 291 | #endif | 291 | #endif |
diff --git a/arch/arm/mach-imx/mach-pca100.c b/arch/arm/mach-imx/mach-pca100.c index a389d1148f18..23c9e1f37b9c 100644 --- a/arch/arm/mach-imx/mach-pca100.c +++ b/arch/arm/mach-imx/mach-pca100.c | |||
| @@ -419,13 +419,13 @@ static void __init pca100_init(void) | |||
| 419 | #if defined(CONFIG_USB_ULPI) | 419 | #if defined(CONFIG_USB_ULPI) |
| 420 | if (otg_mode_host) { | 420 | if (otg_mode_host) { |
| 421 | otg_pdata.otg = otg_ulpi_create(&mxc_ulpi_access_ops, | 421 | otg_pdata.otg = otg_ulpi_create(&mxc_ulpi_access_ops, |
| 422 | USB_OTG_DRV_VBUS | USB_OTG_DRV_VBUS_EXT); | 422 | ULPI_OTG_DRVVBUS | ULPI_OTG_DRVVBUS_EXT); |
| 423 | 423 | ||
| 424 | mxc_register_device(&mxc_otg_host, &otg_pdata); | 424 | mxc_register_device(&mxc_otg_host, &otg_pdata); |
| 425 | } | 425 | } |
| 426 | 426 | ||
| 427 | usbh2_pdata.otg = otg_ulpi_create(&mxc_ulpi_access_ops, | 427 | usbh2_pdata.otg = otg_ulpi_create(&mxc_ulpi_access_ops, |
| 428 | USB_OTG_DRV_VBUS | USB_OTG_DRV_VBUS_EXT); | 428 | ULPI_OTG_DRVVBUS | ULPI_OTG_DRVVBUS_EXT); |
| 429 | 429 | ||
| 430 | mxc_register_device(&mxc_usbh2, &usbh2_pdata); | 430 | mxc_register_device(&mxc_usbh2, &usbh2_pdata); |
| 431 | #endif | 431 | #endif |