* [PATCH] ARM: imx: remove #ifdefery for unmerged flexcan driver
@ 2010-08-14 12:00 Uwe Kleine-König
2010-08-14 17:31 ` Marc Kleine-Budde
0 siblings, 1 reply; 2+ messages in thread
From: Uwe Kleine-König @ 2010-08-14 12:00 UTC (permalink / raw)
To: linux-arm-kernel
The flexcan driver was merged as e955cead.
Cc: Sascha Hauer <s.hauer@pengutronix.de>
Cc: Marc Kleine-Budde <mkl@pengutronix.de>
Cc: Wolfgang Grandegger <wg@grandegger.com>
Signed-off-by: Uwe Kleine-K?nig <u.kleine-koenig@pengutronix.de>
---
arch/arm/plat-mxc/devices/Makefile | 5 +----
arch/arm/plat-mxc/include/mach/devices-common.h | 12 ------------
2 files changed, 1 insertions(+), 16 deletions(-)
diff --git a/arch/arm/plat-mxc/devices/Makefile b/arch/arm/plat-mxc/devices/Makefile
index 347da51..2062ab4 100644
--- a/arch/arm/plat-mxc/devices/Makefile
+++ b/arch/arm/plat-mxc/devices/Makefile
@@ -1,7 +1,4 @@
-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_FLEXCAN) += platform-flexcan.o
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
diff --git a/arch/arm/plat-mxc/include/mach/devices-common.h b/arch/arm/plat-mxc/include/mach/devices-common.h
index 1190016..12bdc7d 100644
--- a/arch/arm/plat-mxc/include/mach/devices-common.h
+++ b/arch/arm/plat-mxc/include/mach/devices-common.h
@@ -14,23 +14,11 @@ struct platform_device *imx_add_platform_device(const char *name, int id,
const struct resource *res, unsigned int num_resources,
const void *data, size_t size_data);
-#if defined (CONFIG_CAN_FLEXCAN) || defined (CONFIG_CAN_FLEXCAN_MODULE)
#include <linux/can/platform/flexcan.h>
struct platform_device *__init imx_add_flexcan(int id,
resource_size_t iobase, resource_size_t iosize,
resource_size_t irq,
const struct flexcan_platform_data *pdata);
-#else
-/* the ifdef can be removed once the flexcan driver has been merged */
-struct flexcan_platform_data;
-static inline struct platform_device *__init imx_add_flexcan(int id,
- resource_size_t iobase, resource_size_t iosize,
- resource_size_t irq,
- const struct flexcan_platform_data *pdata)
-{
- return NULL;
-}
-#endif
#include <mach/i2c.h>
struct platform_device *__init imx_add_imx_i2c(int id,
--
1.7.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [PATCH] ARM: imx: remove #ifdefery for unmerged flexcan driver
2010-08-14 12:00 [PATCH] ARM: imx: remove #ifdefery for unmerged flexcan driver Uwe Kleine-König
@ 2010-08-14 17:31 ` Marc Kleine-Budde
0 siblings, 0 replies; 2+ messages in thread
From: Marc Kleine-Budde @ 2010-08-14 17:31 UTC (permalink / raw)
To: linux-arm-kernel
Uwe Kleine-K?nig wrote:
> The flexcan driver was merged as e955cead.
>
> Cc: Sascha Hauer <s.hauer@pengutronix.de>
> Cc: Marc Kleine-Budde <mkl@pengutronix.de>
> Cc: Wolfgang Grandegger <wg@grandegger.com>
> Signed-off-by: Uwe Kleine-K?nig <u.kleine-koenig@pengutronix.de>
Acked-by: Marc Kleine-Budde <mkl@pengutronix.de>
Cheers, Marc
> ---
> arch/arm/plat-mxc/devices/Makefile | 5 +----
> arch/arm/plat-mxc/include/mach/devices-common.h | 12 ------------
> 2 files changed, 1 insertions(+), 16 deletions(-)
>
> diff --git a/arch/arm/plat-mxc/devices/Makefile b/arch/arm/plat-mxc/devices/Makefile
> index 347da51..2062ab4 100644
> --- a/arch/arm/plat-mxc/devices/Makefile
> +++ b/arch/arm/plat-mxc/devices/Makefile
> @@ -1,7 +1,4 @@
> -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_FLEXCAN) += platform-flexcan.o
> 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
> diff --git a/arch/arm/plat-mxc/include/mach/devices-common.h b/arch/arm/plat-mxc/include/mach/devices-common.h
> index 1190016..12bdc7d 100644
> --- a/arch/arm/plat-mxc/include/mach/devices-common.h
> +++ b/arch/arm/plat-mxc/include/mach/devices-common.h
> @@ -14,23 +14,11 @@ struct platform_device *imx_add_platform_device(const char *name, int id,
> const struct resource *res, unsigned int num_resources,
> const void *data, size_t size_data);
>
> -#if defined (CONFIG_CAN_FLEXCAN) || defined (CONFIG_CAN_FLEXCAN_MODULE)
> #include <linux/can/platform/flexcan.h>
> struct platform_device *__init imx_add_flexcan(int id,
> resource_size_t iobase, resource_size_t iosize,
> resource_size_t irq,
> const struct flexcan_platform_data *pdata);
> -#else
> -/* the ifdef can be removed once the flexcan driver has been merged */
> -struct flexcan_platform_data;
> -static inline struct platform_device *__init imx_add_flexcan(int id,
> - resource_size_t iobase, resource_size_t iosize,
> - resource_size_t irq,
> - const struct flexcan_platform_data *pdata)
> -{
> - return NULL;
> -}
> -#endif
>
> #include <mach/i2c.h>
> struct platform_device *__init imx_add_imx_i2c(int id,
--
Pengutronix e.K. | Marc Kleine-Budde |
Industrial Linux Solutions | Phone: +49-231-2826-924 |
Vertretung West/Dortmund | Fax: +49-5121-206917-5555 |
Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de |
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 260 bytes
Desc: OpenPGP digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20100814/5262b4da/attachment.sig>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-08-14 17:31 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-08-14 12:00 [PATCH] ARM: imx: remove #ifdefery for unmerged flexcan driver Uwe Kleine-König
2010-08-14 17:31 ` Marc Kleine-Budde
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).