From: David S. Miller <davem@davemloft.net>
Date: Tue, 17 Nov 2009 08:05:02 +0000 (-0800)
Subject: Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=a2bfbc072e279ff81e6b336acff612b9bc2e5281;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git

Merge branch 'master' of /linux/kernel/git/davem/net-2.6

Conflicts:
	drivers/net/can/Kconfig
---

a2bfbc072e279ff81e6b336acff612b9bc2e5281
diff --cc drivers/net/can/Kconfig
index c16e6ff139d0,772f6d2489ce..732b093e0815
--- a/drivers/net/can/Kconfig
+++ b/drivers/net/can/Kconfig
@@@ -95,38 -41,10 +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