fix build: undef pcmcia_parse_tuple before redefine it again. Signed-off-by: Hauke Mehrtens <hauke@xxxxxxxxxx> --- compat/compat-2.6.28.h | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/compat/compat-2.6.28.h b/compat/compat-2.6.28.h index fdc021a..e25259f 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); -- 1.6.2.1 -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
