From 83a67ada16e32193fce401dd09bc8e43d0be02f7 Mon Sep 17 00:00:00 2001 From: Gary King Date: Tue, 15 Dec 2009 17:22:57 -0800 Subject: fsl_udc_core: fix glue of _UDC_NAME macro onto function prefixes copy __glue / ___glue from the ARM include files if they aren't already defined Change-Id: I9ca516b42ee5cb0d774ffc4ba7b2f091aed99c72 --- drivers/usb/gadget/fsl_usb2_udc.h | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) (limited to 'drivers') diff --git a/drivers/usb/gadget/fsl_usb2_udc.h b/drivers/usb/gadget/fsl_usb2_udc.h index ab31468749bd..d8a626763f7b 100644 --- a/drivers/usb/gadget/fsl_usb2_udc.h +++ b/drivers/usb/gadget/fsl_usb2_udc.h @@ -594,11 +594,20 @@ struct platform_device; #endif #ifdef _UDC_NAME -#define platform_udc_clk_init _UDC_NAME##_udc_clk_init -#define platform_udc_clk_finalize _UDC_NAME##_udc_clk_finalize -#define platform_udc_clk_release _UDC_NAME##_udc_clk_release -#define platform_udc_clk_suspend _UDC_NAME##_udc_clk_suspend -#define platform_udc_clk_resume _UDC_NAME##_udc_clk_resume +#ifndef __glue +#ifdef __STDC__ +#define ___glue(prefix,fn) prefix##fn +#else +#define ___glue(prefix,fn) prefix/**/fn +#endif +#define __glue(prefix,fn) ___glue(prefix,fn) +#endif + +#define platform_udc_clk_init __glue(_UDC_NAME,_udc_clk_init) +#define platform_udc_clk_finalize __glue(_UDC_NAME,_udc_clk_finalize) +#define platform_udc_clk_release __glue(_UDC_NAME,_udc_clk_release) +#define platform_udc_clk_suspend __glue(_UDC_NAME,_udc_clk_suspend) +#define platform_udc_clk_resume __glue(_UDC_NAME,_udc_clk_resume) extern int platform_udc_clk_init(struct platform_device *pdev); -- cgit v1.2.3