diff options
| -rw-r--r-- | driver-core.current/firmware_class-fix-typo-in-error-path.patch | 1 | ||||
| -rw-r--r-- | series | 2 | ||||
| -rw-r--r-- | usb.current/arm-imx-fix-build-failure-concerning-otg-ulpi.patch | 86 | ||||
| -rw-r--r-- | version | 2 |
4 files changed, 90 insertions, 1 deletions
diff --git a/driver-core.current/firmware_class-fix-typo-in-error-path.patch b/driver-core.current/firmware_class-fix-typo-in-error-path.patch index 1a17c3494390eb..75894f1fec913c 100644 --- a/driver-core.current/firmware_class-fix-typo-in-error-path.patch +++ b/driver-core.current/firmware_class-fix-typo-in-error-path.patch @@ -20,6 +20,7 @@ Broken by commit f8a4bd3456b988fc73b2c. Reported-by: Wey-Yi Guy <wey-yi.w.guy@intel.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com> Acked-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> +Signed-off-by: Pekka Enberg <penberg@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- @@ -53,6 +53,7 @@ usb.current/usb-xhci-update-ring-dequeue-pointer-when-process-missed-tds.patch usb.current/usb-iowarrior-fix-misuse-of-return-value-of-copy_to_user.patch usb.current/usb-adutux-fix-misuse-of-return-value-of-copy_to_user.patch usb.current/usb-ftdi_sio-add-product-id-for-lenz-li-usb.patch +usb.current/arm-imx-fix-build-failure-concerning-otg-ulpi.patch ################################# @@ -91,3 +92,4 @@ staging.current/staging-spectra-removes-unused-functions.patch + diff --git a/usb.current/arm-imx-fix-build-failure-concerning-otg-ulpi.patch b/usb.current/arm-imx-fix-build-failure-concerning-otg-ulpi.patch new file mode 100644 index 00000000000000..66853a5a9e8d6b --- /dev/null +++ b/usb.current/arm-imx-fix-build-failure-concerning-otg-ulpi.patch @@ -0,0 +1,86 @@ +From ukl@pengutronix.de Mon Aug 23 09:54:58 2010 +From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= <u.kleine-koenig@pengutronix.de> +To: linux-kernel@vger.kernel.org, + linux-arm-kernel@lists.infradead.org, linux-usb@vger.kernel.org +Cc: Sergei Shtylyov <sshtylyov@mvista.com>, + Igor Grinberg <grinberg@compulab.co.il>, + Mike Rapoport <mike@compulab.co.il>, + Greg Kroah-Hartman <gregkh@suse.de> +Subject: ARM: imx: fix build failure concerning otg/ulpi +Date: Fri, 13 Aug 2010 14:06:50 +0200 +Message-Id: <1281701210-27776-1-git-send-email-u.kleine-koenig@pengutronix.de> + +The build failure was introduced by + + 13dd0c9 (USB: otg/ulpi: extend the generic ulpi driver.) + +Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> +Acked-by: Igor Grinberg <grinberg@compulab.co.il> +Cc: Mike Rapoport <mike@compulab.co.il> +Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> + +--- + arch/arm/mach-imx/mach-cpuimx27.c | 4 ++-- + arch/arm/mach-imx/mach-pca100.c | 4 ++-- + arch/arm/mach-mx25/mach-cpuimx25.c | 2 +- + arch/arm/mach-mx3/mach-cpuimx35.c | 2 +- + 4 files changed, 6 insertions(+), 6 deletions(-) + +--- 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( + #if defined(CONFIG_USB_ULPI) + if (otg_mode_host) { + otg_pdata.otg = otg_ulpi_create(&mxc_ulpi_access_ops, +- USB_OTG_DRV_VBUS | USB_OTG_DRV_VBUS_EXT); ++ ULPI_OTG_DRVVBUS | ULPI_OTG_DRVVBUS_EXT); + + mxc_register_device(&mxc_otg_host, &otg_pdata); + } + + usbh2_pdata.otg = otg_ulpi_create(&mxc_ulpi_access_ops, +- USB_OTG_DRV_VBUS | USB_OTG_DRV_VBUS_EXT); ++ ULPI_OTG_DRVVBUS | ULPI_OTG_DRVVBUS_EXT); + + mxc_register_device(&mxc_usbh2, &usbh2_pdata); + #endif +--- 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) + #if defined(CONFIG_USB_ULPI) + if (otg_mode_host) { + otg_pdata.otg = otg_ulpi_create(&mxc_ulpi_access_ops, +- USB_OTG_DRV_VBUS | USB_OTG_DRV_VBUS_EXT); ++ ULPI_OTG_DRVVBUS | ULPI_OTG_DRVVBUS_EXT); + + mxc_register_device(&mxc_otg_host, &otg_pdata); + } + + usbh2_pdata.otg = otg_ulpi_create(&mxc_ulpi_access_ops, +- USB_OTG_DRV_VBUS | USB_OTG_DRV_VBUS_EXT); ++ ULPI_OTG_DRVVBUS | ULPI_OTG_DRVVBUS_EXT); + + mxc_register_device(&mxc_usbh2, &usbh2_pdata); + #endif +--- a/arch/arm/mach-mx25/mach-cpuimx25.c ++++ b/arch/arm/mach-mx25/mach-cpuimx25.c +@@ -138,7 +138,7 @@ static void __init eukrea_cpuimx25_init( + #if defined(CONFIG_USB_ULPI) + if (otg_mode_host) { + otg_pdata.otg = otg_ulpi_create(&mxc_ulpi_access_ops, +- USB_OTG_DRV_VBUS | USB_OTG_DRV_VBUS_EXT); ++ ULPI_OTG_DRVVBUS | ULPI_OTG_DRVVBUS_EXT); + + mxc_register_device(&mxc_otg, &otg_pdata); + } +--- a/arch/arm/mach-mx3/mach-cpuimx35.c ++++ b/arch/arm/mach-mx3/mach-cpuimx35.c +@@ -192,7 +192,7 @@ static void __init mxc_board_init(void) + #if defined(CONFIG_USB_ULPI) + if (otg_mode_host) { + otg_pdata.otg = otg_ulpi_create(&mxc_ulpi_access_ops, +- USB_OTG_DRV_VBUS | USB_OTG_DRV_VBUS_EXT); ++ ULPI_OTG_DRVVBUS | ULPI_OTG_DRVVBUS_EXT); + + mxc_register_device(&mxc_otg_host, &otg_pdata); + } @@ -1 +1 @@ -2.6.36-rc1 +2.6.36-rc2 |