diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2009-06-30 16:26:06 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2009-06-30 16:26:06 +0200 |
| commit | 136e45b88fad5b8de839610c0837182110a45803 (patch) | |
| tree | fb2705f86941c2156e67ec4951b9770c6572525b | |
| parent | a92445d4f4afb51e535c4a7cfd72ca8e86bd943d (diff) | |
| download | linux-2.6-136e45b88fad5b8de839610c0837182110a45803.tar.gz linux-2.6-136e45b88fad5b8de839610c0837182110a45803.tar.xz | |
add to pcm970 CAN support
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| -rw-r--r-- | arch/arm/mach-mx2/pcm970-baseboard.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/arch/arm/mach-mx2/pcm970-baseboard.c b/arch/arm/mach-mx2/pcm970-baseboard.c index 8999695ce10..96a97187752 100644 --- a/arch/arm/mach-mx2/pcm970-baseboard.c +++ b/arch/arm/mach-mx2/pcm970-baseboard.c @@ -26,9 +26,7 @@ #include <linux/regulator/machine.h> #include <media/soc_camera.h> -#if defined CONFIG_CAN_SJA1000 || defined CONFIG_CAN_SJA1000_MODULE -#include <linux/can/sja1000_platform.h> -#endif +#include <linux/can/platform/sja1000.h> #include <asm/mach/arch.h> #include <asm/mach-types.h> @@ -396,7 +394,6 @@ struct mx27_camera_platform_data pcm970_camera = { MX27_CAMERA_PACK_DIR_MSB, }; -#if defined CONFIG_CAN_SJA1000 || defined CONFIG_CAN_SJA1000_MODULE static struct resource pcm970_sja1000_resources[] = { { .start = CS4_BASE_ADDR, @@ -423,7 +420,6 @@ static struct platform_device pcm970_sja1000 = { .resource = pcm970_sja1000_resources, .num_resources = ARRAY_SIZE(pcm970_sja1000_resources), }; -#endif /* * system init for baseboard usage. Will be called by pcm038 init. |