Merge tag 'gfs2-merge-window' of git://git.kernel.org/pub/scm/linux/kernel/git/steve...

[karo-tx-linux.git] / drivers / net / can / sja1000 / Kconfig

diff --git a/drivers/net/can/sja1000/Kconfig b/drivers/net/can/sja1000/Kconfig
index ff2ba86cd4a495cdd29020f02561a1f31926ff11..4b18b87655231c3f5ee445a30dc8b85fcddb265c 100644 (file)
--- 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"