* linux-next: manual merge of the arm-soc tree with Linus' tree
@ 2011-11-24 0:58 Stephen Rothwell
2011-11-24 15:55 ` Arnd Bergmann
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2011-11-24 0:58 UTC (permalink / raw)
To: Arnd Bergmann
Cc: linux-next, linux-kernel, Jean-Christophe PLAGNIOL-VILLARD,
David Miller, netdev, Jamie Iles
[-- Attachment #1: Type: text/plain, Size: 920 bytes --]
Hi Arnd,
Today's linux-next merge of the arm-soc tree got a conflict in
drivers/net/ethernet/cadence/Kconfig between commit eccab1ec87d0
("net/cadence: enable by default NET_ATMEL") from Linus' tree and commit
f75ba50bdc2b ("macb: initial support for Cadence GEM") from the arm-soc
tree.
I fixed it up (see below) and can carry the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/net/ethernet/cadence/Kconfig
index b48378a,a2e1500..0000000
--- a/drivers/net/ethernet/cadence/Kconfig
+++ b/drivers/net/ethernet/cadence/Kconfig
@@@ -5,9 -5,8 +5,9 @@@
config HAVE_NET_MACB
bool
- config NET_ATMEL
- bool "Atmel devices"
+ config NET_CADENCE
+ bool "Cadence devices"
+ default y
depends on HAVE_NET_MACB || (ARM && ARCH_AT91RM9200)
---help---
If you have a network (Ethernet) card belonging to this class, say Y.
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-11-24 15:55 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-11-24 0:58 linux-next: manual merge of the arm-soc tree with Linus' tree Stephen Rothwell
2011-11-24 15:55 ` Arnd Bergmann
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox