diff options
| author | Florian Vaussard <florian.vaussard@epfl.ch> | 2014-01-31 08:34:35 -0500 |
|---|---|---|
| committer | Marc Kleine-Budde <mkl@pengutronix.de> | 2014-02-04 04:10:51 -0500 |
| commit | 02729c3d08c9334d03d61d365ff2408514a46c81 (patch) | |
| tree | ed4ae93aff4bac0aa27c61eabb177f8dbe0f7da3 /drivers/net/can/sja1000/Makefile | |
| parent | 342180f7dcfb00e4019a0cd0f0e9bfd0c186c710 (diff) | |
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>
Diffstat (limited to 'drivers/net/can/sja1000/Makefile')
| -rw-r--r-- | drivers/net/can/sja1000/Makefile | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/can/sja1000/Makefile b/drivers/net/can/sja1000/Makefile index b3d05cbfec36..531d5fcc97e5 100644 --- a/drivers/net/can/sja1000/Makefile +++ b/drivers/net/can/sja1000/Makefile | |||
| @@ -5,7 +5,6 @@ | |||
| 5 | obj-$(CONFIG_CAN_SJA1000) += sja1000.o | 5 | obj-$(CONFIG_CAN_SJA1000) += sja1000.o |
| 6 | obj-$(CONFIG_CAN_SJA1000_ISA) += sja1000_isa.o | 6 | obj-$(CONFIG_CAN_SJA1000_ISA) += sja1000_isa.o |
| 7 | obj-$(CONFIG_CAN_SJA1000_PLATFORM) += sja1000_platform.o | 7 | obj-$(CONFIG_CAN_SJA1000_PLATFORM) += sja1000_platform.o |
| 8 | obj-$(CONFIG_CAN_SJA1000_OF_PLATFORM) += sja1000_of_platform.o | ||
| 9 | obj-$(CONFIG_CAN_EMS_PCMCIA) += ems_pcmcia.o | 8 | obj-$(CONFIG_CAN_EMS_PCMCIA) += ems_pcmcia.o |
| 10 | obj-$(CONFIG_CAN_EMS_PCI) += ems_pci.o | 9 | obj-$(CONFIG_CAN_EMS_PCI) += ems_pci.o |
| 11 | obj-$(CONFIG_CAN_KVASER_PCI) += kvaser_pci.o | 10 | obj-$(CONFIG_CAN_KVASER_PCI) += kvaser_pci.o |