tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

net/can/mscan: improve build

- move Kconfig entries to the subdirectory
- do remaining renames of mpc52xx to mpc5xxx

Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
Signed-off-by: David S. Miller <davem@davemloft.net>

authored by

Wolfram Sang and committed by
David S. Miller 24cfbcba 323907ac

+26 -20
+1 -18
drivers/net/can/Kconfig
··· 54 54 ---help--- 55 55 Driver for the Microchip MCP251x SPI CAN controllers. 56 56 57 - config CAN_MSCAN 58 - depends on CAN_DEV && (PPC || M68K || M68KNOMMU) 59 - tristate "Support for Freescale MSCAN based chips" 60 - ---help--- 61 - The Motorola Scalable Controller Area Network (MSCAN) definition 62 - is based on the MSCAN12 definition which is the specific 63 - implementation of the Motorola Scalable CAN concept targeted for 64 - the Motorola MC68HC12 Microcontroller Family. 65 - 66 - config CAN_MPC52XX 67 - tristate "Freescale MPC5xxx onboard CAN controller" 68 - depends on CAN_MSCAN && PPC_MPC52xx 69 - ---help--- 70 - If you say yes here you get support for Freescale's MPC52xx 71 - onboard dualCAN controller. 72 - 73 - This driver can also be built as a module. If so, the module 74 - will be called mpc5xxx_can. 57 + source "drivers/net/can/mscan/Kconfig" 75 58 76 59 source "drivers/net/can/sja1000/Kconfig" 77 60
+23
drivers/net/can/mscan/Kconfig
··· 1 + config CAN_MSCAN 2 + depends on CAN_DEV && (PPC || M68K || M68KNOMMU) 3 + tristate "Support for Freescale MSCAN based chips" 4 + ---help--- 5 + The Motorola Scalable Controller Area Network (MSCAN) definition 6 + is based on the MSCAN12 definition which is the specific 7 + implementation of the Motorola Scalable CAN concept targeted for 8 + the Motorola MC68HC12 Microcontroller Family. 9 + 10 + if CAN_MSCAN 11 + 12 + config CAN_MPC5XXX 13 + tristate "Freescale MPC5xxx onboard CAN controller" 14 + depends on PPC_MPC52xx 15 + ---help--- 16 + If you say yes here you get support for Freescale's MPC5xxx 17 + onboard CAN controller. 18 + 19 + This driver can also be built as a module. If so, the module 20 + will be called mscan-mpc5xxx.ko. 21 + 22 + endif 23 +
+2 -2
drivers/net/can/mscan/Makefile
··· 1 1 2 - obj-$(CONFIG_CAN_MPC52XX) += mscan-mpc52xx.o 3 - mscan-mpc52xx-objs := mscan.o mpc52xx_can.o 2 + obj-$(CONFIG_CAN_MPC5XXX) += mscan-mpc5xxx.o 3 + mscan-mpc5xxx-objs := mscan.o mpc5xxx_can.o 4 4 5 5 ccflags-$(CONFIG_CAN_DEBUG_DEVICES) := -DDEBUG
drivers/net/can/mscan/mpc52xx_can.c drivers/net/can/mscan/mpc5xxx_can.c