Fixed bug in PCMCIA initialization.

Added PCMCIA support for IVML24.

diff --git a/CHANGELOG b/CHANGELOG
index 2d0dcefe405bfa45d32439410cca1132520f90bd..36988a94d7c447ad71c13b7f0b586b48e249235e 100644 (file)
--- 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 89b604c8547cedaa8a6d70888190c5d6e6d364f0..3f8dfa6019a8b56988b1aab58f2afb8e330e2610 100644 (file)
--- 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