From: Hauke Mehrtens <hauke@hauke-m.de>
Date: Sun, 18 Jul 2010 19:09:22 +0000 (+0200)
Subject: compat: fix build if CONFIG_PCCARD=y and CONFIG_PCMCIA=n
X-Git-Tag: v2.6.37-rc1-1~39
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=8444e0fd85383df3ead06cf4409413458628f45f;p=compat-rdma%2Fcompat.git

compat: fix build if CONFIG_PCCARD=y and CONFIG_PCMCIA=n

The includes are needed for pccard_loop_tuple.

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

diff --git a/include/linux/compat-2.6.33.h b/include/linux/compat-2.6.33.h
index 0b434fc..e4dff72 100644
--- a/include/linux/compat-2.6.33.h
+++ b/include/linux/compat-2.6.33.h
@@ -7,12 +7,10 @@
 
 #include <linux/skbuff.h>
 #if defined(CONFIG_PCCARD) || defined(CONFIG_PCCARD_MODULE)
-#if defined(CONFIG_PCMCIA) || defined(CONFIG_PCMCIA_MODULE)
 #include <pcmcia/cs_types.h>
 #include <pcmcia/cistpl.h>
 #include <pcmcia/ds.h>
 #endif
-#endif
 #include <linux/kfifo.h>
 #include <linux/firmware.h>