diff options
author | Hauke Mehrtens <hauke@hauke-m.de> | 2013-06-01 18:00:16 +0200 |
---|---|---|
committer | Luis R. Rodriguez <mcgrof@do-not-panic.com> | 2013-06-05 21:35:49 -0700 |
commit | 6b67c2df5712110c8014ba07895299acd61a243c (patch) | |
tree | 0022f5d38986d34cb8b95893144964bf95ecaf4f /backport | |
parent | 29fd6c5a94cfeae011379a8011ff145fda34a0a7 (diff) |
backports: protect pcmcia_enable_device
This is already defined in RHEL 6.4
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>
Diffstat (limited to 'backport')
-rw-r--r-- | backport/backport-include/pcmcia/ds.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/backport/backport-include/pcmcia/ds.h b/backport/backport-include/pcmcia/ds.h index f0cc5feb..48e8fb4a 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) |