can: sja1000: fuse of_platform into platform

The OpenFirmware probe can be merged into the standard platform
probe to leverage common code.

Signed-off-by: Florian Vaussard <florian.vaussard@epfl.ch>
Tested-by: Andreas Larsson <andreas@gaisler.com>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>

1 files changed, 3 insertions, 10 deletions

diff --git a/drivers/net/can/sja1000/Kconfig b/drivers/net/can/sja1000/Kconfig
index ff2ba86cd4a4..4b18b8765523 100644
--- a/drivers/net/can/sja1000/Kconfig
+++ b/drivers/net/can/sja1000/Kconfig
@@ -17,16 +17,9 @@ config CAN_SJA1000_PLATFORM
           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 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.
+          PCM038. It also provides 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_PCMCIA
         tristate "EMS CPC-CARD Card"