From: Hauke Mehrtens <hauke@hauke-m.de>
Date: Sat, 8 Aug 2009 12:38:12 +0000 (+0200)
Subject: pcmcia_parse_tuple was redefined in pcmcia/cistpl.h
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=e32e686689596c6e45aeb772917ecf771913b61e;p=openwrt%2Fstaging%2Fblogic.git

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 fdc021a24ecf..e25259f39fa8 100644
--- 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);