* [PATCH] MX2: devices.c: Fix typo in imx21 usb mem resource address
@ 2010-04-11 12:54 Lars-Peter Clausen
2010-04-11 18:39 ` Uwe Kleine-König
0 siblings, 1 reply; 2+ messages in thread
From: Lars-Peter Clausen @ 2010-04-11 12:54 UTC (permalink / raw)
To: linux-arm-kernel
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
---
arch/arm/mach-mx2/devices.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/mach-mx2/devices.c b/arch/arm/mach-mx2/devices.c
index b91e412..67182e1 100644
--- a/arch/arm/mach-mx2/devices.c
+++ b/arch/arm/mach-mx2/devices.c
@@ -483,8 +483,8 @@ int __init mxc_register_gpios(void)
#ifdef CONFIG_MACH_MX21
static struct resource mx21_usbhc_resources[] = {
{
- .start = MX21_BASE_ADDR,
- .end = MX21_BASE_ADDR + 0x1FFF,
+ .start = MX21_USBOTG_BASE_ADDR,
+ .end = MX21_USBOTG_BASE_ADDR + 0x1FFF,
.flags = IORESOURCE_MEM,
},
{
--
1.5.6.5
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [PATCH] MX2: devices.c: Fix typo in imx21 usb mem resource address
2010-04-11 12:54 [PATCH] MX2: devices.c: Fix typo in imx21 usb mem resource address Lars-Peter Clausen
@ 2010-04-11 18:39 ` Uwe Kleine-König
0 siblings, 0 replies; 2+ messages in thread
From: Uwe Kleine-König @ 2010-04-11 18:39 UTC (permalink / raw)
To: linux-arm-kernel
Hello,
this was introduced by
988addf (Merge branch 'origin' into devel-stable)
when trying to fix a (logic) merge conflict.
On Sun, Apr 11, 2010 at 02:54:31PM +0200, Lars-Peter Clausen wrote:
> Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
> ---
> arch/arm/mach-mx2/devices.c | 4 ++--
> 1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm/mach-mx2/devices.c b/arch/arm/mach-mx2/devices.c
> index b91e412..67182e1 100644
> --- a/arch/arm/mach-mx2/devices.c
> +++ b/arch/arm/mach-mx2/devices.c
> @@ -483,8 +483,8 @@ int __init mxc_register_gpios(void)
> #ifdef CONFIG_MACH_MX21
> static struct resource mx21_usbhc_resources[] = {
> {
> - .start = MX21_BASE_ADDR,
> - .end = MX21_BASE_ADDR + 0x1FFF,
> + .start = MX21_USBOTG_BASE_ADDR,
> + .end = MX21_USBOTG_BASE_ADDR + 0x1FFF,
Would you mind making this
... + 0x1fff,
as this is the only line left using capital letters for hex numbers in
that file.
Thanks
Uwe
--
Pengutronix e.K. | Uwe Kleine-K?nig |
Industrial Linux Solutions | http://www.pengutronix.de/ |
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-04-11 18:39 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-04-11 12:54 [PATCH] MX2: devices.c: Fix typo in imx21 usb mem resource address Lars-Peter Clausen
2010-04-11 18:39 ` Uwe Kleine-König
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).