linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: u.kleine-koenig@pengutronix.de (Uwe Kleine-König)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH] MX2: devices.c: Fix typo in imx21 usb mem resource address
Date: Sun, 11 Apr 2010 20:39:15 +0200	[thread overview]
Message-ID: <20100411183915.GA4679@pengutronix.de> (raw)
In-Reply-To: <1270990471-28137-1-git-send-email-lars@metafoo.de>

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/  |

      reply	other threads:[~2010-04-11 18:39 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
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 message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20100411183915.GA4679@pengutronix.de \
    --to=u.kleine-koenig@pengutronix.de \
    --cc=linux-arm-kernel@lists.infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).