Patch Fixes the following warning drivers/pcmcia/at91_cf.c:55:1: warning: "SZ_2K" redefined In file included from arch/arm/mach-at91/include/mach/hardware.h:17, from arch/arm/mach-at91/include/mach/memory.h:24, from /media/skub/linux-git-wkg/linux-git/linux-next/arch/arm/include/asm/memory.h:18, from /media/skub/linux-git-wkg/linux-git/linux-next/arch/arm/include/asm/page.h:197, from include/linux/mmzone.h:20, from include/linux/gfp.h:4, from include/linux/kmod.h:22, from include/linux/module.h:13, from drivers/pcmcia/at91_cf.c:12: /media/skub/linux-git-wkg/linux-git/linux-next/arch/arm/include/asm/sizes.h:32:1: warning: this is the location of the previous definition Signed-off-by: vibi sreenivasan, CMS COMPUTERS LTD, INDIA <vibi_sreenivasan@xxxxxxx> --- drivers/pcmcia/at91_cf.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/drivers/pcmcia/at91_cf.c b/drivers/pcmcia/at91_cf.c index 9e1140f..a5a7842 100644 --- a/drivers/pcmcia/at91_cf.c +++ b/drivers/pcmcia/at91_cf.c @@ -52,7 +52,6 @@ struct at91_cf_socket { unsigned long phys_baseaddr; }; -#define SZ_2K (2 * SZ_1K) static inline int at91_cf_present(struct at91_cf_socket *cf) { -- 1.6.3.3 -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html