diff options
| author | William Lai <b04597@freescale.com> | 2010-02-02 14:32:36 +0800 |
|---|---|---|
| committer | Alejandro Gonzalez <alex.gonzalez@digi.com> | 2010-05-25 11:13:36 +0200 |
| commit | 5693b964744291c1f406e75b37005bed534d085b (patch) | |
| tree | 3473c2c1fdaca2d58860ef8cc66227bf11341983 /drivers/net | |
| parent | 71843f08f749a29f671f5ae41a29eafb98777636 (diff) | |
ENGR00120661-1 MX28 CAN: MX28 platform support
CAN supported on MX28 platform.
Signed-off-by: William Lai <b04597@freescale.com>
Signed-off-by: Alejandro Gonzalez <alex.gonzalez@digi.com>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/can/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/net/can/flexcan/dev.c | 3 | ||||
| -rw-r--r-- | drivers/net/can/flexcan/drv.c | 5 |
3 files changed, 8 insertions, 2 deletions
diff --git a/drivers/net/can/Kconfig b/drivers/net/can/Kconfig index b7b101e3a884..a6bf9a7fddd9 100644 --- a/drivers/net/can/Kconfig +++ b/drivers/net/can/Kconfig @@ -86,7 +86,7 @@ config CAN_DEBUG_DEVICES config CAN_FLEXCAN tristate "Freescale FlexCAN" - depends on CAN && (ARCH_MX25 || ARCH_MX35) + depends on CAN && (ARCH_MX25 || ARCH_MX35 || ARCH_MX28) default m ---help--- This select the support of Freescale CAN(FlexCAN). diff --git a/drivers/net/can/flexcan/dev.c b/drivers/net/can/flexcan/dev.c index 178a49ab05a8..389f85d75709 100644 --- a/drivers/net/can/flexcan/dev.c +++ b/drivers/net/can/flexcan/dev.c @@ -30,6 +30,9 @@ #include <linux/module.h> #include <mach/hardware.h> +#ifdef CONFIG_ARCH_MXS +#include <mach/device.h> +#endif #include "flexcan.h" enum { diff --git a/drivers/net/can/flexcan/drv.c b/drivers/net/can/flexcan/drv.c index 342b52a129c2..baa0f991c525 100644 --- a/drivers/net/can/flexcan/drv.c +++ b/drivers/net/can/flexcan/drv.c @@ -1,5 +1,5 @@ /* - * Copyright 2008-2009 Freescale Semiconductor, Inc. All Rights Reserved. + * Copyright 2008-2010 Freescale Semiconductor, Inc. All Rights Reserved. */ /* @@ -28,6 +28,9 @@ #include <linux/platform_device.h> #include <linux/regulator/consumer.h> #include <linux/clk.h> +#ifdef CONFIG_ARCH_MXS +#include <mach/device.h> +#endif #include <asm/io.h> #include <asm/irq.h> |