From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stephen Rothwell Subject: linux-next: manual merge of the net tree with the unicore32 tree Date: Tue, 23 Aug 2011 13:02:10 +1000 Message-ID: <20110823130210.766d466d689d60536f59340a@canb.auug.org.au> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Guan Xuetao , Zhang Shu , Chu Xiaowei , Su Yonggang , Jeff Kirsher To: David Miller , Return-path: Sender: linux-next-owner@vger.kernel.org List-Id: netdev.vger.kernel.org Hi all, Today's linux-next merge of the net tree got conflicts in drivers/net/Kconfig and drivers/net/Makefile between commit e8787de6fa83 ("unicore32: add pkunity-v3 mac/net driver (umal)") from the unicore32 tree and the network driver rearrangement from the net tree. I just added the new driver from the unicore32 tree commit into each file (see below). -- Cheers, Stephen Rothwell sfr@canb.auug.org.au diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index ef6b6be..df5e990 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig @@ -215,6 +215,12 @@ source "drivers/s390/net/Kconfig" source "drivers/net/caif/Kconfig" +config MAC_PUV3 + tristate "PKUnity v3 UMAL Gigabit Network Adapter support" + depends on UNICORE32 && ARCH_PUV3 + select MII + select PHYLIB + config XEN_NETDEV_FRONTEND tristate "Xen network device frontend driver" depends on XEN diff --git a/drivers/net/Makefile b/drivers/net/Makefile index c33009b..9896ad1 100644 --- a/drivers/net/Makefile +++ b/drivers/net/Makefile @@ -23,6 +23,7 @@ obj-$(CONFIG_RIONET) += rionet.o obj-$(CONFIG_NET) += Space.o loopback.o obj-$(CONFIG_NET_SB1000) += sb1000.o +obj-$(CONFIG_MAC_PUV3) += mac-puv3.o obj-$(CONFIG_PPP) += ppp_generic.o obj-$(CONFIG_PPP_ASYNC) += ppp_async.o obj-$(CONFIG_PPP_SYNC_TTY) += ppp_synctty.o