pcmcia_parse_tuple was redefined in pcmcia/cistpl.h

fix build:
undef pcmcia_parse_tuple before redefine it again.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>

diff --git a/compat/compat-2.6.28.h b/compat/compat-2.6.28.h
index fdc021a24ecff6e0a78d906ed05aa3a3755c6f1f..e25259f39fa82e876d1180c730bab1b44b14eb88 100644 (file)
--- a/compat/compat-2.6.28.h
+++ b/compat/compat-2.6.28.h
@@ -29,7 +29,13 @@
 })
 #endif /* From include/asm-generic/bug.h */
 
-#define pcmcia_parse_tuple(tuple, parse) pcmcia_parse_tuple(NULL, tuple, parse)
+#include <pcmcia/cs_types.h>
+#include <pcmcia/cs.h>
+#include <pcmcia/cistpl.h>
+#ifdef pcmcia_parse_tuple
+#undef pcmcia_parse_tuple
+#define pcmcia_parse_tuple(tuple, parse) pccard_parse_tuple(tuple, parse)
+#endif
 
 #if 0
 extern void usb_poison_urb(struct urb *urb);