Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b93cf3f0 authored by Oliver Hartkopp's avatar Oliver Hartkopp Committed by David S. Miller
Browse files

can: Fix driver Kconfig structure 



In 2.6.32-rc the new EMS USB CAN driver was contributed and added the Kconfig
entry right behind an entry of the same *vendor*. This teared the SJA1000
based driver selection into pieces.

This fix cleans up the 2.6.32-rc Kconfig files for the CAN drivers and moves
the SJA1000 and USB Kconfig portions into the belonging directories.

As there are many new CAN drivers in the queue getting this cleanup into
2.6.32-rc would massively reduce the problems for the upcoming drivers.

Thanks,
Oliver

Signed-off-by: default avatarOliver Hartkopp <oliver@hartkopp.net>
Signed-off-by: default avatarWolfgang Grandegger <wg@grandegger.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d0490cfd

drivers/net/can/Kconfig

+5 −55
Original line number Diff line number Diff line
@@ -35,66 +35,16 @@ config CAN_CALC_BITTIMING 
	  arguments "tq", "prop_seg", "phase_seg1", "phase_seg2" and "sjw".

	  If unsure, say Y.



config CAN_SJA1000

	depends on CAN_DEV && HAS_IOMEM

	tristate "Philips SJA1000"

	---help---

	  Driver for the SJA1000 CAN controllers from Philips or NXP



config CAN_SJA1000_ISA

	depends on CAN_SJA1000 && ISA

	tristate "ISA Bus based legacy SJA1000 driver"

	---help---

	  This driver adds legacy support for SJA1000 chips connected to

	  the ISA bus using I/O port, memory mapped or indirect access.



config CAN_SJA1000_PLATFORM

	depends on CAN_SJA1000

	tristate "Generic Platform Bus based SJA1000 driver"

	---help---

	  This driver adds support for the SJA1000 chips connected to

	  the "platform bus" (Linux abstraction for directly to the

	  processor attached devices).  Which can be found on various

	  boards from Phytec (http://www.phytec.de) like the PCM027,

	  PCM038.



config CAN_SJA1000_OF_PLATFORM

	depends on CAN_SJA1000 && PPC_OF

	tristate "Generic OF Platform Bus based SJA1000 driver"

	---help---

	  This driver adds support for the SJA1000 chips connected to

	  the OpenFirmware "platform bus" found on embedded systems with

	  OpenFirmware bindings, e.g. if you have a PowerPC based system

	  you may want to enable this option.



config CAN_EMS_PCI

	tristate "EMS CPC-PCI, CPC-PCIe and CPC-104P Card"

	depends on PCI && CAN_SJA1000

	---help---

	  This driver is for the one, two or four channel CPC-PCI,

	  CPC-PCIe and CPC-104P cards from EMS Dr. Thomas Wuensche

	  (http://www.ems-wuensche.de).



config CAN_EMS_USB

	tristate "EMS CPC-USB/ARM7 CAN/USB interface"

	depends on USB && CAN_DEV

	---help---

	  This driver is for the one channel CPC-USB/ARM7 CAN/USB interface

	  from from EMS Dr. Thomas Wuensche (http://www.ems-wuensche.de).



config CAN_KVASER_PCI

	tristate "Kvaser PCIcanx and Kvaser PCIcan PCI Cards"

	depends on PCI && CAN_SJA1000

	---help---

	  This driver is for the the PCIcanx and PCIcan cards (1, 2 or

	  4 channel) from Kvaser (http://www.kvaser.com).



config CAN_AT91

	tristate "Atmel AT91 onchip CAN controller"

	depends on CAN && CAN_DEV && ARCH_AT91SAM9263

	depends on CAN_DEV && ARCH_AT91SAM9263

	---help---

	  This is a driver for the SoC CAN controller in Atmel's AT91SAM9263.



source "drivers/net/can/sja1000/Kconfig"



source "drivers/net/can/usb/Kconfig"



config CAN_DEBUG_DEVICES

	bool "CAN devices debugging messages"

	depends on CAN

drivers/net/can/sja1000/Kconfig

0 → 100644
+47 −0
Original line number Diff line number Diff line 
menuconfig CAN_SJA1000

	tristate "Philips/NXP SJA1000 devices"

	depends on CAN_DEV && HAS_IOMEM



if CAN_SJA1000



config CAN_SJA1000_ISA

	tristate "ISA Bus based legacy SJA1000 driver"

	depends on ISA

	---help---

	  This driver adds legacy support for SJA1000 chips connected to

	  the ISA bus using I/O port, memory mapped or indirect access.



config CAN_SJA1000_PLATFORM

	tristate "Generic Platform Bus based SJA1000 driver"

	---help---

	  This driver adds support for the SJA1000 chips connected to

	  the "platform bus" (Linux abstraction for directly to the

	  processor attached devices).  Which can be found on various

	  boards from Phytec (http://www.phytec.de) like the PCM027,

	  PCM038.



config CAN_SJA1000_OF_PLATFORM

	tristate "Generic OF Platform Bus based SJA1000 driver"

	depends on PPC_OF

	---help---

	  This driver adds support for the SJA1000 chips connected to

	  the OpenFirmware "platform bus" found on embedded systems with

	  OpenFirmware bindings, e.g. if you have a PowerPC based system

	  you may want to enable this option.



config CAN_EMS_PCI

	tristate "EMS CPC-PCI, CPC-PCIe and CPC-104P Card"

	depends on PCI

	---help---

	  This driver is for the one, two or four channel CPC-PCI,

	  CPC-PCIe and CPC-104P cards from EMS Dr. Thomas Wuensche

	  (http://www.ems-wuensche.de).



config CAN_KVASER_PCI

	tristate "Kvaser PCIcanx and Kvaser PCIcan PCI Cards"

	depends on PCI

	---help---

	  This driver is for the the PCIcanx and PCIcan cards (1, 2 or

	  4 channel) from Kvaser (http://www.kvaser.com).



endif

drivers/net/can/usb/Kconfig

0 → 100644
+10 −0
Original line number Diff line number Diff line 
menu "CAN USB interfaces"

	depends on USB && CAN_DEV



config CAN_EMS_USB

	tristate "EMS CPC-USB/ARM7 CAN/USB interface"

	---help---

	  This driver is for the one channel CPC-USB/ARM7 CAN/USB interface

	  from from EMS Dr. Thomas Wuensche (http://www.ems-wuensche.de).



endmenu

drivers/net/can/usb/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -3,3 +3,5 @@ 
#



obj-$(CONFIG_CAN_EMS_USB) += ems_usb.o



ccflags-$(CONFIG_CAN_DEBUG_DEVICES) := -DDEBUG