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 [email protected]
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 http://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
Hello Stephen,
Stephen Rothwell wrote:
> 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
Indeed this cleanup was made in net-2.6 to fix the Kconfig structure before
2.6.32 is finalized.
The 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.
added Kconfig entries right behind the CAN_AT91 driver - and that's because
the net-2.6 patch "can: Fix driver Kconfig structure" refuses to apply cleanly
on net-next-2.6 ...
>
> I fixed it up (see below) and can carry the fix for a while. (I am not
> sure the fix is entirely correct.)
>
Yes. You only added the new Kconfig entries (for CAN_TI_HECC, CAN_MCP251X,
CAN_MSCAN, ...) to the patch "can: Fix driver Kconfig structure", right?
These are the only added items in drivers/net/can/Kconfig from net-2.6 to
net-next-2.6.
Thanks,
Oliver
From: Stephen Rothwell <[email protected]>
Date: Tue, 17 Nov 2009 13:16:37 +1100
> I fixed it up (see below) and can carry the fix for a while. (I am not
> sure the fix is entirely correct.)
I'll merge net-2.6 into net-next-2.6 so you won't see this tomorrow.
Thanks!
Hi Dave,
On Tue, 17 Nov 2009 00:07:20 -0800 (PST) David Miller <[email protected]> wrote:
>
> From: Stephen Rothwell <[email protected]>
> Date: Tue, 17 Nov 2009 13:16:37 +1100
>
> > I fixed it up (see below) and can carry the fix for a while. (I am not
> > sure the fix is entirely correct.)
>
> I'll merge net-2.6 into net-next-2.6 so you won't see this tomorrow.
Great, thanks.
--
Cheers,
Stephen Rothwell [email protected]
http://www.canb.auug.org.au/~sfr/
Hi Oliver,
On Tue, 17 Nov 2009 09:00:18 +0100 Oliver Hartkopp <[email protected]> wrote:
>
> Yes. You only added the new Kconfig entries (for CAN_TI_HECC, CAN_MCP251X,
> CAN_MSCAN, ...) to the patch "can: Fix driver Kconfig structure", right?
Yes.
> These are the only added items in drivers/net/can/Kconfig from net-2.6 to
> net-next-2.6.
And it looks like Dave will fix this up for me tomorrow.
--
Cheers,
Stephen Rothwell [email protected]
http://www.canb.auug.org.au/~sfr/