mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: David Miller <davem@davemloft.net>, <netdev@vger.kernel.org>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Wolfram Sang <w.sang@pengutronix.de>,
	Christian Pellegrin <chripell@fsfe.org>,
	Wolfgang Grandegger <wg@grandegger.com>,
	Anant Gole <anantgole@ti.com>,
	Oliver Hartkopp <oliver@hartkopp.net>
Subject: linux-next: manual merge of the net tree with the net-current tree
Date: Tue, 17 Nov 2009 13:16:37 +1100	[thread overview]
Message-ID: <20091117131637.3a35f898.sfr@canb.auug.org.au> (raw)

Hi all,

Today's linux-next merge of the net tree got a conflict in
drivers/net/can/Kconfig between commit
b93cf3f0bb45560d2ce62bdcc2181c40660cfdbf ("can: Fix driver Kconfig
structure") from the net-current tree and commits
3758bf25db8caeec667e4e56e030da0ec3060529 ("can: add TI CAN (HECC)
driver"), e0000163e30eeb112b41486ea113fd54f64e1f17 ("can: Driver for the
Microchip MCP251x SPI CAN controllers") and
afa17a500a3667f66df450100538d06769529bba ("net/can: add driver for mscan
family & mpc52xx_mscan") from the net tree.

I fixed it up (see below) and can carry the fix for a while. (I am not
sure the fix is entirely correct.)

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/net/can/Kconfig
index 772f6d2,c16e6ff..0000000
--- a/drivers/net/can/Kconfig
+++ b/drivers/net/can/Kconfig
@@@ -41,10 -95,38 +41,42 @@@ config CAN_AT9
  	---help---
  	  This is a driver for the SoC CAN controller in Atmel's AT91SAM9263.
  
+ config CAN_TI_HECC
+ 	depends on CAN_DEV && ARCH_OMAP3
+ 	tristate "TI High End CAN Controller"
+ 	---help---
+ 	  Driver for TI HECC (High End CAN Controller) module found on many
+ 	  TI devices. The device specifications are available from www.ti.com
+ 
+ config CAN_MCP251X
+ 	tristate "Microchip MCP251x SPI CAN controllers"
+ 	depends on CAN_DEV && SPI
+ 	---help---
+ 	  Driver for the Microchip MCP251x SPI CAN controllers.
+ 
+ config CAN_MSCAN
+ 	depends on CAN_DEV && (PPC || M68K || M68KNOMMU)
+ 	tristate "Support for Freescale MSCAN based chips"
+ 	---help---
+ 	  The Motorola Scalable Controller Area Network (MSCAN) definition
+ 	  is based on the MSCAN12 definition which is the specific
+ 	  implementation of the Motorola Scalable CAN concept targeted for
+ 	  the Motorola MC68HC12 Microcontroller Family.
+ 
+ config CAN_MPC52XX
+ 	tristate "Freescale MPC5xxx onboard CAN controller"
+ 	depends on CAN_MSCAN && PPC_MPC52xx
+ 	---help---
+ 	  If you say yes here you get support for Freescale's MPC52xx
+ 	  onboard dualCAN controller.
+ 
+ 	  This driver can also be built as a module.  If so, the module
+ 	  will be called mpc5xxx_can.
+ 
 +source "drivers/net/can/sja1000/Kconfig"
 +
 +source "drivers/net/can/usb/Kconfig"
 +
  config CAN_DEBUG_DEVICES
  	bool "CAN devices debugging messages"
  	depends on CAN

             reply	other threads:[~2009-11-17  2:16 UTC|newest]

Thread overview: 73+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-11-17  2:16 Stephen Rothwell [this message]
2009-11-17  8:00 ` Oliver Hartkopp
2009-11-17  8:16   ` Stephen Rothwell
2009-11-17  8:07 ` David Miller
2009-11-17  8:10   ` Stephen Rothwell
  -- strict thread matches above, loose matches on Subject: below --
2011-09-28  2:54 Stephen Rothwell
2011-09-28  5:36 ` David Miller
2011-06-20  2:56 Stephen Rothwell
2011-06-20  3:39 ` Simon Horman
2011-06-20  4:26   ` David Miller
2011-05-17  2:01 Stephen Rothwell
2011-05-10  1:49 Stephen Rothwell
2011-05-10 11:55 ` Sathya.Perla
2011-05-03  3:15 Stephen Rothwell
2011-05-03  3:42 ` David Miller
2011-05-03  4:21   ` Stephen Rothwell
2011-04-19  3:16 Stephen Rothwell
2011-04-19  7:41 ` David Miller
2011-04-07  1:39 Stephen Rothwell
2011-04-07 20:48 ` David Miller
2011-03-08  3:09 Stephen Rothwell
2011-03-08  9:44 ` Dmitry Kravkov
2011-03-09  0:11   ` Stephen Rothwell
2011-03-03  2:40 Stephen Rothwell
2011-02-18  1:20 Stephen Rothwell
2011-02-09  0:56 Stephen Rothwell
2011-02-09  1:06 ` David Miller
2010-12-15  0:45 Stephen Rothwell
2010-11-19  0:17 Stephen Rothwell
2010-11-19 21:14 ` David Miller
2010-11-19  0:17 Stephen Rothwell
2010-11-19 21:11 ` David Miller
2010-10-07  1:31 Stephen Rothwell
2010-10-07  2:35 ` David Miller
2010-10-01  2:48 Stephen Rothwell
2010-10-01  2:48 Stephen Rothwell
2010-10-01  3:27 ` Jerry Chu
2010-10-05  5:47   ` David Miller
2010-09-23  2:14 Stephen Rothwell
2010-08-02  1:04 Stephen Rothwell
2010-07-29  1:19 Stephen Rothwell
2010-07-29  1:26 ` Jeff Kirsher
2010-07-29  1:05 Stephen Rothwell
2010-07-29  5:51 ` Jiri Pirko
2010-07-20  2:20 Stephen Rothwell
2010-07-20  2:34 ` Joe Perches
2010-07-21  1:27   ` David Miller
2010-06-23  2:51 Stephen Rothwell
2010-06-23  4:14 ` Herbert Xu
2010-06-25 18:22 ` David Miller
2010-06-15  2:00 Stephen Rothwell
2009-11-24  3:11 Stephen Rothwell
2009-11-30  1:12 ` David Miller
2009-11-24  3:11 Stephen Rothwell
2009-11-25  7:52 ` Jeff Kirsher
2009-11-30  1:11 ` David Miller
2009-11-30  2:46   ` Stephen Rothwell
2009-11-23  1:00 Stephen Rothwell
2009-11-23  1:19 ` David Miller
2009-11-23  2:04   ` Stephen Rothwell
2009-11-23  2:11     ` David Miller
2009-11-23  1:00 Stephen Rothwell
2009-11-23 18:09 ` Amit Salecha
2009-11-23 23:17   ` Stephen Rothwell
2009-11-09  2:03 Stephen Rothwell
2009-11-09  4:59 ` David Miller
2009-11-06  0:55 Stephen Rothwell
2009-11-06  1:40 ` David Miller
2009-11-06  2:32   ` Stephen Rothwell
2009-08-14  2:40 Stephen Rothwell
2009-08-14  2:50 ` David Miller
2009-08-14  4:19   ` Stephen Rothwell
2009-08-14  5:27   ` Dhananjay Phadke

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=20091117131637.3a35f898.sfr@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=anantgole@ti.com \
    --cc=chripell@fsfe.org \
    --cc=davem@davemloft.net \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=netdev@vger.kernel.org \
    --cc=oliver@hartkopp.net \
    --cc=w.sang@pengutronix.de \
    --cc=wg@grandegger.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

all inboxes | Powered by JetHome®