diff options
| author | Marc Kleine-Budde <mkl@pengutronix.de> | 2010-07-22 11:45:34 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2010-07-26 15:05:29 +0200 |
| commit | 61c68502321d94a421f9a2a32f6789ecb27f382d (patch) | |
| tree | f11a63bf01c5438d5c44deb14e45f38d85aec243 /arch/arm/plat-mxc/devices/Makefile | |
| parent | a7d945a469ee566bde26217362c95f29acfbd14a (diff) | |
| download | lwn-61c68502321d94a421f9a2a32f6789ecb27f382d.tar.gz lwn-61c68502321d94a421f9a2a32f6789ecb27f382d.zip | |
imx: dynamically register flexcan devices for mx25 and mx35
In order to make this patch compile, even if the flexcan driver with
it's header defining the platform data isn't merged yet, two ifdefs have
been added. They effect that the "imx_add_flexcan" function results in a
no-op function if the driver hasn't been activated.
These ifdefs can be removed after the flexcan driver has been merged.
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/plat-mxc/devices/Makefile')
| -rw-r--r-- | arch/arm/plat-mxc/devices/Makefile | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/plat-mxc/devices/Makefile b/arch/arm/plat-mxc/devices/Makefile index 5ecbb244d210..347da5161f7e 100644 --- a/arch/arm/plat-mxc/devices/Makefile +++ b/arch/arm/plat-mxc/devices/Makefile @@ -1,3 +1,7 @@ +ifdef CONFIG_CAN_FLEXCAN +# the ifdef can be removed once the flexcan driver has been merged +obj-$(CONFIG_IMX_HAVE_PLATFORM_FLEXCAN) += platform-flexcan.o +endif obj-$(CONFIG_IMX_HAVE_PLATFORM_IMX_I2C) += platform-imx-i2c.o obj-$(CONFIG_IMX_HAVE_PLATFORM_IMX_UART) += platform-imx-uart.o obj-$(CONFIG_IMX_HAVE_PLATFORM_MXC_NAND) += platform-mxc_nand.o |