Merge git://git.infradead.org/users/dwmw2/mtd-2.6.38

[mv-sheeva.git] / drivers / net / can / mscan / Kconfig

diff --git a/drivers/net/can/mscan/Kconfig b/drivers/net/can/mscan/Kconfig
index cd0f2d6f375d3e42e2384290251831c43308cb28..d38706958af6c7e3dad46ca3358685c7d2c7ebf8 100644 (file)
--- a/drivers/net/can/mscan/Kconfig
+++ b/drivers/net/can/mscan/Kconfig
@@ -1,5 +1,5 @@
 config CAN_MSCAN
-       depends on CAN_DEV && (PPC || M68K || M68KNOMMU)
+       depends on CAN_DEV && (PPC || M68K)
        tristate "Support for Freescale MSCAN based chips"
        ---help---
          The Motorola Scalable Controller Area Network (MSCAN) definition
@@ -11,12 +11,13 @@ if CAN_MSCAN
 
 config CAN_MPC5XXX
        tristate "Freescale MPC5xxx onboard CAN controller"
-       depends on PPC_MPC52xx
+       depends on (PPC_MPC52xx || PPC_MPC512x)
        ---help---
          If you say yes here you get support for Freescale's MPC5xxx
-         onboard CAN controller.
+         onboard CAN controller. Currently, the MPC5200, MPC5200B and
+         MPC5121 (Rev. 2 and later) are supported.
 
-         This driver can also be built as a module.  If so, the module
+         This driver can also be built as a module. If so, the module
          will be called mscan-mpc5xxx.ko.
 
 endif