diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2010-01-27 18:48:51 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-01-27 18:48:51 -0800 |
| commit | 81178581cf2a7491a998572b2bae72a0bf4ff5b6 (patch) | |
| tree | fbb9ef5637c02011dc4919e812c1f860dca71919 /usb.current | |
| parent | f2ec6d71bba130efa1a586362ec0871b831fb952 (diff) | |
| download | patches-81178581cf2a7491a998572b2bae72a0bf4ff5b6.tar.gz | |
more patches
Diffstat (limited to 'usb.current')
| -rw-r--r-- | usb.current/usb-g_multi-fix-config_usb_g_multi_rndis-usage.patch | 34 | ||||
| -rw-r--r-- | usb.current/usb-otg-kconfig-let-usb_otg_utils-select-usb_ulpi-option.patch | 41 |
2 files changed, 75 insertions, 0 deletions
diff --git a/usb.current/usb-g_multi-fix-config_usb_g_multi_rndis-usage.patch b/usb.current/usb-g_multi-fix-config_usb_g_multi_rndis-usage.patch new file mode 100644 index 00000000000000..0776793fd138dc --- /dev/null +++ b/usb.current/usb-g_multi-fix-config_usb_g_multi_rndis-usage.patch @@ -0,0 +1,34 @@ +From m.nazarewicz@samsung.com Wed Jan 27 18:18:07 2010 +From: Michal Nazarewicz <m.nazarewicz@samsung.com> +Date: Fri, 22 Jan 2010 15:18:21 +0100 +Subject: USB: g_multi: fix CONFIG_USB_G_MULTI_RNDIS usage +To: Randy Dunlap <randy.dunlap@oracle.com>, Stephen Rothwell <sfr@canb.auug.org.au>, Greg KH <greg@kroah.com>, Randy Dunlap <randy.dunlap@oracle.com>, Stephen Rothwell <sfr@canb.auug.org.au>, Greg KH <greg@kroah.com> +Cc: Michal Nazarewicz <m.nazarewicz@samsung.com>, linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Marek Szyprowski <m.szyprowski@samsung.com>, Kyungmin Park <kyungmin.park@samsung.com> +Message-ID: <1264169901-12475-1-git-send-email-m.nazarewicz@samsung.com> + + +g_multi used CONFIG_USB_ETH_RNDIS to check if RNDIS option was requested +where it should check for CONFIG_USB_G_MULTI_RNDIS. As a result, RNDIS +was never present in g_multi regardless of configuration. + +This fixes changes made in commit 396cda90d228d0851f3d64c7c85a1ecf6b8ae1e8. + +Signed-off-by: Michal Nazarewicz <m.nazarewicz@samsung.com> +Cc: Marek Szyprowski <m.szyprowski@samsung.com> +Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> + +--- + drivers/usb/gadget/multi.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/usb/gadget/multi.c ++++ b/drivers/usb/gadget/multi.c +@@ -29,7 +29,7 @@ + #if defined USB_ETH_RNDIS + # undef USB_ETH_RNDIS + #endif +-#ifdef CONFIG_USB_ETH_RNDIS ++#ifdef CONFIG_USB_G_MULTI_RNDIS + # define USB_ETH_RNDIS y + #endif + diff --git a/usb.current/usb-otg-kconfig-let-usb_otg_utils-select-usb_ulpi-option.patch b/usb.current/usb-otg-kconfig-let-usb_otg_utils-select-usb_ulpi-option.patch new file mode 100644 index 00000000000000..d7c3b81b2528a2 --- /dev/null +++ b/usb.current/usb-otg-kconfig-let-usb_otg_utils-select-usb_ulpi-option.patch @@ -0,0 +1,41 @@ +From valentin.longchamp@epfl.ch Wed Jan 27 18:24:25 2010 +From: Valentin Longchamp <valentin.longchamp@epfl.ch> +Date: Wed, 20 Jan 2010 20:06:31 +0100 +Subject: USB: otg Kconfig: let USB_OTG_UTILS select USB_ULPI option +To: s.hauer@pengutronix.de, u.kleine-koenig@pengutronix.de, daniel@caiaq.de +Cc: linux-arm-kernel@lists.infradead.org, linux-usb@vger.kernel.org, Valentin Longchamp <valentin.longchamp@epfl.ch> +Message-ID: <1264014391-11521-1-git-send-email-valentin.longchamp@epfl.ch> + + +With CONFIG_USB_ULPI=y, CONFIG_USB<=m, CONFIG_PCI=n and +CONFIG_USB_OTG_UTILS=n, which is the default used for mx31moboard, +the build for all mx3 platforms fails because drivers/usb/otg/ulpi.c +where otg_ulpi_create is defined is not compiled. + +Build error: +arch/arm/mach-mx3/built-in.o: In function `mxc_board_init': +kzmarm11.c:(.init.text+0x73c): undefined reference to `otg_ulpi_create' +kzmarm11.c:(.init.text+0x1020): undefined reference to `otg_ulpi_create' + +This isn't a strong dependency as drivers/usb/otg/ulpi.c doesn't +use functions defined in drivers/usb/otg/otg.o and is only needed +to get ulpi.o linked into the kernel image. + +Signed-off-by: Valentin Longchamp <valentin.longchamp@epfl.ch> +Acked-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> +Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> + +--- + drivers/usb/otg/Kconfig | 1 + + 1 file changed, 1 insertion(+) + +--- a/drivers/usb/otg/Kconfig ++++ b/drivers/usb/otg/Kconfig +@@ -44,6 +44,7 @@ config ISP1301_OMAP + config USB_ULPI + bool "Generic ULPI Transceiver Driver" + depends on ARM ++ select USB_OTG_UTILS + help + Enable this to support ULPI connected USB OTG transceivers which + are likely found on embedded boards. |