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>

4 files changed, 26 insertions, 20 deletions

diff --git a/drivers/net/can/Kconfig b/drivers/net/can/Kconfig
index 732b093e0815..bb803fa1e6a7 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 000000000000..cd0f2d6f375d
--- /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 2bd9f04c7908..c9fab17cd8b4 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 1de6f6349b16..1de6f6349b16 100644
--- a/drivers/net/can/mscan/mpc52xx_can.c
+++ b/drivers/net/can/mscan/mpc5xxx_can.c