From 6b67c2df5712110c8014ba07895299acd61a243c Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Sat, 1 Jun 2013 18:00:16 +0200 Subject: [PATCH] backports: protect pcmcia_enable_device This is already defined in RHEL 6.4 Signed-off-by: Hauke Mehrtens Signed-off-by: Luis R. Rodriguez --- backport/backport-include/pcmcia/ds.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/backport/backport-include/pcmcia/ds.h b/backport/backport-include/pcmcia/ds.h index f0cc5feb9a07..48e8fb4a7323 100644 --- a/backport/backport-include/pcmcia/ds.h +++ b/backport/backport-include/pcmcia/ds.h @@ -27,7 +27,9 @@ #endif #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,37) -#define pcmcia_enable_device(link) pcmcia_request_configuration(link, &link->conf) +#ifndef pcmcia_enable_device +#define pcmcia_enable_device(link) pcmcia_request_configuration(link, &(link)->conf) +#endif #endif #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,36) -- 2.30.2