can: sja1000: fuse of_platform into platform
authorFlorian Vaussard <florian.vaussard@epfl.ch>
Fri, 31 Jan 2014 13:34:35 +0000 (14:34 +0100)
committerMarc Kleine-Budde <mkl@pengutronix.de>
Tue, 4 Feb 2014 09:10:51 +0000 (10:10 +0100)
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>
drivers/net/can/sja1000/Kconfig
drivers/net/can/sja1000/Makefile
drivers/net/can/sja1000/sja1000_of_platform.c [deleted file]
drivers/net/can/sja1000/sja1000_platform.c

Simple merge
Simple merge
diff --cc drivers/net/can/sja1000/sja1000_of_platform.c
Simple merge