From 42ceb018dba6a852026b7ffbf8f05e3f5803b276 Mon Sep 17 00:00:00 2001
From: wdenk <wdenk>
Date: Sun, 21 Jan 2001 15:40:43 +0000
Subject: [PATCH] Fixed bug in PCMCIA initialization. Added PCMCIA support for
 IVML24.

---
 CHANGELOG        |  8 +++++++-
 include/pcmcia.h | 11 ++++-------
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 2d0dcef..36988a9 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -58,7 +58,13 @@ To do:
   (and it uses default address).
 
 ======================================================================
-Modifications for 0.7.4:
+Modifications since 0.8.0:
+======================================================================
+
+* Fix bug in PCMCIA initialization; add PCMCIA support for IVML24
+
+======================================================================
+Modifications for 0.8.0:
 ======================================================================
 
 ----------------------------------------------------------------------
diff --git a/include/pcmcia.h b/include/pcmcia.h
index 89b604c..3f8dfa6 100644
--- a/include/pcmcia.h
+++ b/include/pcmcia.h
@@ -31,8 +31,7 @@
  * Allow configuration to select PCMCIA slot,
  * or try to generate a useful default
  */
-#if (CONFIG_COMMANDS & CFG_CMD_PCMCIA) || \
-    ((CONFIG_COMMANDS & CFG_CMD_IDE) && defined(CONFIG_IDE_PCCARD))
+#if (CONFIG_COMMANDS & CFG_CMD_PCMCIA) || (CONFIG_COMMANDS & CFG_CMD_IDE)
 
 #if !defined(CONFIG_PCMCIA_SLOT_A) && !defined(CONFIG_PCMCIA_SLOT_B)
 
@@ -53,9 +52,7 @@
 # define	CONFIG_PCMCIA_SLOT_B	/* ... and SLOT_B else		*/
 #elif defined(CONFIG_SPD823TS)		/* The SPD8xx use SLOT_B	*/
 # define CONFIG_PCMCIA_SLOT_B
-#elif defined(CONFIG_IVMS8)		/* The IVMS8  use SLOT_A	*/
-# define CONFIG_PCMCIA_SLOT_A
-#elif defined(CONFIG_IVML24)		/* The IVML24 use SLOT_A	*/
+#elif defined(CONFIG_IVMS8) || defined(CONFIG_IVML24)	/* The IVM* use SLOT_A	*/
 # define CONFIG_PCMCIA_SLOT_A
 #else
 # error "PCMCIA Slot not configured"
@@ -63,6 +60,8 @@
 
 #endif /* !defined(CONFIG_PCMCIA_SLOT_A) && !defined(CONFIG_PCMCIA_SLOT_B) */
 
+#endif	/* CFG_CMD_PCMCIA || CFG_CMD_IDE */
+
 /* Make sure exactly one slot is defined - we support only one for now */
 #if !defined(CONFIG_PCMCIA_SLOT_A) && !defined(CONFIG_PCMCIA_SLOT_B)
 #error Neither CONFIG_PCMCIA_SLOT_A nor CONFIG_PCMCIA_SLOT_B configured
@@ -71,8 +70,6 @@
 #error Both CONFIG_PCMCIA_SLOT_A and CONFIG_PCMCIA_SLOT_B configured
 #endif
 
-#endif	/* CFG_CMD_PCMCIA || (CFG_CMD_IDE && CONFIG_IDE_PCCARD) */
-
 #define PCMCIA_SOCKETS_NO	1
 #define PCMCIA_MEM_WIN_NO	4
 #define PCMCIA_IO_WIN_NO	2
-- 
2.51.0