diff options
| author | Wolfram Sang <w.sang@pengutronix.de> | 2009-11-17 03:57:12 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-11-17 03:57:34 -0800 |
| commit | 24cfbcbabf1faef396ee45b13b25c85d2d17b90d (patch) | |
| tree | 051ee7aaf63a08fa3fc60741b7c576aa8f11d3e3 /drivers/net/can | |
| parent | 323907ac72a223ed4e4d67ce8e3589900023a0c8 (diff) | |
| download | linux-3.10-24cfbcbabf1faef396ee45b13b25c85d2d17b90d.tar.gz linux-3.10-24cfbcbabf1faef396ee45b13b25c85d2d17b90d.tar.bz2 linux-3.10-24cfbcbabf1faef396ee45b13b25c85d2d17b90d.zip | |
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>
Diffstat (limited to 'drivers/net/can')
| -rw-r--r-- | drivers/net/can/Kconfig | 19 | ||||
| -rw-r--r-- | drivers/net/can/mscan/Kconfig | 23 | ||||
| -rw-r--r-- | drivers/net/can/mscan/Makefile | 4 | ||||
| -rw-r--r-- | drivers/net/can/mscan/mpc5xxx_can.c (renamed from drivers/net/can/mscan/mpc52xx_can.c) | 0 |
4 files changed, 26 insertions, 20 deletions
diff --git a/drivers/net/can/Kconfig b/drivers/net/can/Kconfig index 732b093e081..bb803fa1e6a 100644 --- a/drivers/net/can/Kconfig +++ b/drivers/net/can/Kconfig @@ -54,24 +54,7 @@ config CAN_MCP251X ---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/mscan/Kconfig" source "drivers/net/can/sja1000/Kconfig" diff --git a/drivers/net/can/mscan/Kconfig b/drivers/net/can/mscan/Kconfig new file mode 100644 index 00000000000..cd0f2d6f375 --- /dev/null +++ b/drivers/net/can/mscan/Kconfig @@ -0,0 +1,23 @@ +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. + +if CAN_MSCAN + +config CAN_MPC5XXX + tristate "Freescale MPC5xxx onboard CAN controller" + depends on PPC_MPC52xx + ---help--- + If you say yes here you get support for Freescale's MPC5xxx + onboard CAN controller. + + This driver can also be built as a module. If so, the module + will be called mscan-mpc5xxx.ko. + +endif + diff --git a/drivers/net/can/mscan/Makefile b/drivers/net/can/mscan/Makefile index 2bd9f04c790..c9fab17cd8b 100644 --- a/drivers/net/can/mscan/Makefile +++ b/drivers/net/can/mscan/Makefile @@ -1,5 +1,5 @@ -obj-$(CONFIG_CAN_MPC52XX) += mscan-mpc52xx.o -mscan-mpc52xx-objs := mscan.o mpc52xx_can.o +obj-$(CONFIG_CAN_MPC5XXX) += mscan-mpc5xxx.o +mscan-mpc5xxx-objs := mscan.o mpc5xxx_can.o ccflags-$(CONFIG_CAN_DEBUG_DEVICES) := -DDEBUG diff --git a/drivers/net/can/mscan/mpc52xx_can.c b/drivers/net/can/mscan/mpc5xxx_can.c index 1de6f6349b1..1de6f6349b1 100644 --- a/drivers/net/can/mscan/mpc52xx_can.c +++ b/drivers/net/can/mscan/mpc5xxx_can.c |