From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Olof Johansson <olof@lixom.net>, Arnd Bergmann <arnd@arndb.de>,
linux-arm-kernel@lists.infradead.org
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
"Hebbar, Gururaja" <gururaja.hebbar@ti.com>,
Venkatraman S <svenkatr@ti.com>, Chris Ball <cjb@laptop.org>,
Tony Lindgren <tony@atomide.com>
Subject: linux-next: manual merge of the arm-soc tree with the mmc tree
Date: Mon, 26 Nov 2012 21:38:53 +1100 [thread overview]
Message-ID: <20121126213853.ccceb25dc3b3c5a24911abef@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1186 bytes --]
Hi all,
Today's linux-next merge of the arm-soc tree got a conflict in
include/linux/platform_data/mmc-omap.h between commit 69bc0b677e6c ("mmc:
omap_hsmmc: Enable HSPE bit for high speed cards") from the tree and
commit 53db20d123f7 ("mmc: omap: Remove cpu_is_omap usage from the
driver") from the arm-soc tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc include/linux/platform_data/mmc-omap.h
index 346af5b,2bf6ea8..0000000
--- a/include/linux/platform_data/mmc-omap.h
+++ b/include/linux/platform_data/mmc-omap.h
@@@ -126,7 -107,9 +107,10 @@@ struct omap_mmc_platform_data
/* we can put the features above into this variable */
#define HSMMC_HAS_PBIAS (1 << 0)
#define HSMMC_HAS_UPDATED_RESET (1 << 1)
-#define MMC_OMAP7XX (1 << 2)
-#define MMC_OMAP15XX (1 << 3)
-#define MMC_OMAP16XX (1 << 4)
+#define HSMMC_HAS_HSPE_SUPPORT (1 << 2)
++#define MMC_OMAP7XX (1 << 3)
++#define MMC_OMAP15XX (1 << 4)
++#define MMC_OMAP16XX (1 << 5)
unsigned features;
int switch_pin; /* gpio (card detect) */
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
next reply other threads:[~2012-11-26 10:38 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-11-26 10:38 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2012-09-24 9:36 linux-next: manual merge of the arm-soc tree with the mmc tree Stephen Rothwell
2012-09-17 8:01 Stephen Rothwell
2012-04-12 4:02 Stephen Rothwell
2012-04-12 4:54 ` Chris Ball
2012-04-13 12:46 ` Nicolas Ferre
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=20121126213853.ccceb25dc3b3c5a24911abef@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=arnd@arndb.de \
--cc=cjb@laptop.org \
--cc=gururaja.hebbar@ti.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=olof@lixom.net \
--cc=svenkatr@ti.com \
--cc=tony@atomide.com \
/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).