From: linux@arm.linux.org.uk (Russell King - ARM Linux)
To: linux-arm-kernel@lists.infradead.org
Subject: [GIT PULL] AT91 Kconfig rework
Date: Thu, 19 Nov 2009 23:01:22 +0000 [thread overview]
Message-ID: <20091119230122.GI22232@n2100.arm.linux.org.uk> (raw)
In-Reply-To: <4B01702B.4080107@atmel.com>
On Mon, Nov 16, 2009 at 04:30:51PM +0100, Nicolas Ferre wrote:
> Hi Russell,
>
> This is AT91 Kconfig rework for next merge window. After
> discussing it on the mailing-list and Ack by Andrew Victor, I
> send you this patchset. You can pull it from:
>
> git://github.com/at91linux/linux-2.6-at91.git for-rmk
FYI:
$ git pull git://github.com/at91linux/linux-2.6-at91.git for-rmk
remote: Counting objects: 41, done.
remote: Compressing objects: 100% (28/28), done.
remote: Total 30 (delta 26), reused 2 (delta 2)
Unpacking objects: 100% (30/30), done.
>From bogus@does.not.exist.com Fri Nov 6 13:01:15 2009
From: bogus@does.not.exist.com ()
Date: Fri, 06 Nov 2009 18:01:15 -0000
Subject: No subject
Message-ID: <mailman.49.1258671701.2170.linux-arm-kernel@lists.infradead.org>
Auto-merging arch/arm/mach-at91/Kconfig
CONFLICT (content): Merge conflict in arch/arm/mach-at91/Kconfig
Recorded preimage for 'arch/arm/mach-at91/Kconfig'
Automatic merge failed; fix conflicts and then commit the result.
$ git diff-files -u
diff --cc arch/arm/mach-at91/Kconfig
index 2fd8843,3df124e..0000000
--- a/arch/arm/mach-at91/Kconfig
+++ b/arch/arm/mach-at91/Kconfig
@@@ -320,7 -337,7 +337,11 @@@ config MACH_AT91SAM9G20E
config MACH_AT91SAM9G20EK_2MMC
bool "Atmel AT91SAM9G20-EK Evaluation Kit with 2 SD/MMC Slots"
++<<<<<<< HEAD:arch/arm/mach-at91/Kconfig
+ depends on ARCH_AT91SAM9G20
++=======
+ select HAVE_NAND_ATMEL_BUSWIDTH_16
++>>>>>>> 0912e5359f89f303f53fd4874dadab77a4949a8a:arch/arm/mach-at91/Kconfig
help
Select this if you are using an Atmel AT91SAM9G20-EK Evaluation Kit
with 2 SD/MMC Slots. This is the case for AT91SAM9G20-EK rev. C and
@@@ -394,7 -411,7 +415,11 @@@ config MTD_AT91_DATAFLASH_CAR
config MTD_NAND_ATMEL_BUSWIDTH_16
bool "Enable 16-bit data bus interface to NAND flash"
++<<<<<<< HEAD:arch/arm/mach-at91/Kconfig
+ depends on (MACH_AT91SAM9260EK || MACH_AT91SAM9261EK || MACH_AT91SAM9G10EK || MACH_AT91SAM9263EK || MACH_AT91SAM9G20EK || MACH_AT91SAM9G20EK_2MMC || MACH_AT91SAM9G45EKES || MACH_AT91CAP9ADK)
++=======
+ depends on HAVE_NAND_ATMEL_BUSWIDTH_16
++>>>>>>> 0912e5359f89f303f53fd4874dadab77a4949a8a:arch/arm/mach-at91/Kconfig
help
On AT91SAM926x boards both types of NAND flash can be present
(8 and 16 bit data bus width).
What's the resolution? I think the first is just to include both, but
the second looks like the first depends needs deleting to leave only the
second?
next prev parent reply other threads:[~2009-11-19 23:01 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-11-16 15:30 [GIT PULL] AT91 Kconfig rework Nicolas Ferre
2009-11-19 23:01 ` Russell King - ARM Linux [this message]
2009-11-20 12:42 ` 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=20091119230122.GI22232@n2100.arm.linux.org.uk \
--to=linux@arm.linux.org.uk \
--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).