[U-Boot-Users] [PATCH 11/17] Include pcmcia.h only when the drivers is used

[Jean-Christophe PLAGNIOL-VILLARD]

to avoid the following errors :

include/pcmcia.h:72:3: error: #error "PCMCIA Slot not configured"
include/pcmcia.h:79:2: error: #error Neither CONFIG_PCMCIA_SLOT_A nor CONFIG_PCMCIA_SLOT_B configured

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj at jcrosoft.com>
---
 drivers/pcmcia/mpc8xx_pcmcia.c |    2 +-
 drivers/pcmcia/rpx_pcmcia.c    |    2 +-
 drivers/pcmcia/tqm8xx_pcmcia.c |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/pcmcia/mpc8xx_pcmcia.c b/drivers/pcmcia/mpc8xx_pcmcia.c
index 8a34cd3..a4533eb 100644
--- a/drivers/pcmcia/mpc8xx_pcmcia.c
+++ b/drivers/pcmcia/mpc8xx_pcmcia.c
@@ -2,7 +2,6 @@
 #if defined(CONFIG_8xx)
 #include <mpc8xx.h>
 #endif
-#include <pcmcia.h>
 
 #undef	CONFIG_PCMCIA
 
@@ -15,6 +14,7 @@
 #endif
 
 #if defined(CONFIG_8xx)	&& defined(CONFIG_PCMCIA)
+#include <pcmcia.h>
 
 #if	defined(CONFIG_IDE_8xx_PCCARD)
 extern int check_ide_device (int slot);
diff --git a/drivers/pcmcia/rpx_pcmcia.c b/drivers/pcmcia/rpx_pcmcia.c
index c7c425b..11c6a13 100644
--- a/drivers/pcmcia/rpx_pcmcia.c
+++ b/drivers/pcmcia/rpx_pcmcia.c
@@ -5,7 +5,6 @@
 #ifdef CONFIG_8xx
 #include <mpc8xx.h>
 #endif
-#include <pcmcia.h>
 
 #undef	CONFIG_PCMCIA
 
@@ -19,6 +18,7 @@
 
 #if	defined(CONFIG_PCMCIA)	\
 	&& (defined(CONFIG_RPXCLASSIC) || defined(CONFIG_RPXLITE))
+#include <pcmcia.h>
 
 #define	PCMCIA_BOARD_MSG	"RPX CLASSIC or RPX LITE"
 
diff --git a/drivers/pcmcia/tqm8xx_pcmcia.c b/drivers/pcmcia/tqm8xx_pcmcia.c
index 132c7a5..4b2fb2f 100644
--- a/drivers/pcmcia/tqm8xx_pcmcia.c
+++ b/drivers/pcmcia/tqm8xx_pcmcia.c
@@ -6,7 +6,6 @@
 #ifdef CONFIG_8xx
 #include <mpc8xx.h>
 #endif
-#include <pcmcia.h>
 
 #undef	CONFIG_PCMCIA
 
@@ -20,6 +19,7 @@
 
 #if	defined(CONFIG_PCMCIA)	\
 	&& (defined(CONFIG_TQM8xxL) || defined(CONFIG_SVM_SC8xx))
+#include <pcmcia.h>
 
 #if	defined(CONFIG_VIRTLAB2)
 #define	PCMCIA_BOARD_MSG	"Virtlab2"
-- 
1.5.5.1