linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: mkl@pengutronix.de (Marc Kleine-Budde)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 2/5] mx25: Add flexcan devices
Date: Thu, 22 Jul 2010 08:34:20 +0200	[thread overview]
Message-ID: <4C47E66C.3010305@pengutronix.de> (raw)
In-Reply-To: <911441.33834.qm@web51008.mail.re2.yahoo.com>

Fabio Estevam wrote:
> Marc,
> 
> --- On Wed, 7/21/10, Marc Kleine-Budde <mkl@pengutronix.de> wrote:
> ...
>>  
>> +static struct resource mxc_i2c_1_resources[] = {
>> +    {
>> +       
> 
> Shouldn't the inclusion of i2c be handled by a separate patch?
doh! It seems I've handled a rebase conflict wrong.

Thanks for catching this,
Marc
-- 
Pengutronix e.K.                  | Marc Kleine-Budde           |
Industrial Linux Solutions        | Phone: +49-231-2826-924     |
Vertretung West/Dortmund          | Fax:   +49-5121-206917-5555 |
Amtsgericht Hildesheim, HRA 2686  | http://www.pengutronix.de   |

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 260 bytes
Desc: OpenPGP digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20100722/5ef95746/attachment.sig>

  reply	other threads:[~2010-07-22  6:34 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-07-21 21:59 [PATCH 0/5] add flexcan support to i.mx Marc Kleine-Budde
2010-07-21 21:59 ` [PATCH 1/5] mx25: flexcan clock support Marc Kleine-Budde
2010-07-21 21:59 ` [PATCH 2/5] mx25: Add flexcan devices Marc Kleine-Budde
2010-07-21 23:59   ` Fabio Estevam
2010-07-22  6:34     ` Marc Kleine-Budde [this message]
2010-07-21 21:59 ` [PATCH 3/5] mx35: adjust flexcan clock definition Marc Kleine-Budde
2010-07-21 21:59 ` [PATCH 4/5] mx35: add flexcan devices Marc Kleine-Budde
2010-07-21 21:59 ` [PATCH 5/5] pcm043: register flexcan device Marc Kleine-Budde

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=4C47E66C.3010305@pengutronix.de \
    --to=mkl@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).