diff options
Diffstat (limited to 'include')
34 files changed, 43 insertions, 71 deletions
| diff --git a/include/_exports.h b/include/_exports.h index a5799838e..eeb65f40a 100644 --- a/include/_exports.h +++ b/include/_exports.h @@ -15,7 +15,7 @@ EXPORT_FUNC(do_reset)  EXPORT_FUNC(getenv)  EXPORT_FUNC(setenv)  EXPORT_FUNC(simple_strtoul) -#if (CONFIG_COMMANDS & CFG_CMD_I2C) || defined(CONFIG_CMD_I2C) +#if defined(CONFIG_CMD_I2C)  EXPORT_FUNC(i2c_write)  EXPORT_FUNC(i2c_read)  #endif	/* CFG_CMD_I2C */ diff --git a/include/configs/CPU86.h b/include/configs/CPU86.h index 631c78e6e..202914b1f 100644 --- a/include/configs/CPU86.h +++ b/include/configs/CPU86.h @@ -68,9 +68,7 @@   * for FCC)   *   * if CONFIG_ETHER_NONE is defined, then either the ethernet routines must be - * defined elsewhere (as for the console), or CFG_CMD_NET must be removed - * from CONFIG_COMMANDS to remove support for networking. - * + * defined elsewhere (as for the console), or CONFIG_CMD_NET must be unset.   */  #undef	CONFIG_ETHER_ON_SCC		/* define if ether on SCC       */  #define	CONFIG_ETHER_ON_FCC		/* define if ether on FCC       */ diff --git a/include/configs/CPU87.h b/include/configs/CPU87.h index 666cb1307..ce25aa58f 100644 --- a/include/configs/CPU87.h +++ b/include/configs/CPU87.h @@ -69,9 +69,7 @@   * for FCC)   *   * if CONFIG_ETHER_NONE is defined, then either the ethernet routines must be - * defined elsewhere (as for the console), or CFG_CMD_NET must be removed - * from CONFIG_COMMANDS to remove support for networking. - * + * defined elsewhere (as for the console), or CONFIG_CMD_NET must be unset.   */  #undef	CONFIG_ETHER_ON_SCC		/* define if ether on SCC	*/  #define CONFIG_ETHER_ON_FCC		/* define if ether on FCC	*/ diff --git a/include/configs/IDS8247.h b/include/configs/IDS8247.h index 45a96ae78..e26dc5666 100644 --- a/include/configs/IDS8247.h +++ b/include/configs/IDS8247.h @@ -128,9 +128,7 @@   * for FCC)   *   * if CONFIG_ETHER_NONE is defined, then either the ethernet routines must be - * defined elsewhere (as for the console), or CFG_CMD_NET must be removed - * from CONFIG_COMMANDS to remove support for networking. - * + * defined elsewhere (as for the console), or CONFIG_CMD_NET must be unset.   */  #undef	CONFIG_ETHER_ON_SCC		/* define if ether on SCC       */  #define	CONFIG_ETHER_ON_FCC		/* define if ether on FCC       */ diff --git a/include/configs/IPHASE4539.h b/include/configs/IPHASE4539.h index 383ffe2e2..1cb2d6b51 100644 --- a/include/configs/IPHASE4539.h +++ b/include/configs/IPHASE4539.h @@ -67,8 +67,7 @@   * for FCC)   *   * if CONFIG_ETHER_NONE is defined, then either the ethernet routines must be - * defined elsewhere (as for the console), or CFG_CMD_NET must be removed - * from CONFIG_COMMANDS to remove support for networking. + * defined elsewhere (as for the console), or CONFIG_CMD_NET must be unset.   */  #undef	CONFIG_ETHER_ON_SCC		/* define if ether on SCC   */  #define CONFIG_ETHER_ON_FCC		/* define if ether on FCC   */ diff --git a/include/configs/ISPAN.h b/include/configs/ISPAN.h index 75dea18f5..e6ef76566 100644 --- a/include/configs/ISPAN.h +++ b/include/configs/ISPAN.h @@ -58,8 +58,7 @@   * for FCC).   *   * If CONFIG_ETHER_NONE is defined, then either the Ethernet routines must - * be defined elsewhere (as for the console), or CFG_CMD_NET must be removed - * from CONFIG_COMMANDS to remove support for networking. + * be defined elsewhere (as for the console), or CONFIG_CMD_NET must be unset.   */  #undef	CONFIG_ETHER_ON_SCC		/* Define if Ethernet on SCC		*/  #define CONFIG_ETHER_ON_FCC		/* Define if Ethernet on FCC		*/ diff --git a/include/configs/MPC8260ADS.h b/include/configs/MPC8260ADS.h index b41866fcf..a36b69d6b 100644 --- a/include/configs/MPC8260ADS.h +++ b/include/configs/MPC8260ADS.h @@ -101,8 +101,7 @@   * for FCC)   *   * if CONFIG_ETHER_NONE is defined, then either the ethernet routines must be - * defined elsewhere (as for the console), or CFG_CMD_NET must be removed - * from CONFIG_COMMANDS to remove support for networking. + * defined elsewhere (as for the console), or CONFIG_CMD_NET must be unset.   */  #undef	CONFIG_ETHER_ON_SCC		/* define if ether on SCC   */  #define CONFIG_ETHER_ON_FCC		/* define if ether on FCC   */ diff --git a/include/configs/MPC8266ADS.h b/include/configs/MPC8266ADS.h index 306ee49eb..a8c40cf07 100644 --- a/include/configs/MPC8266ADS.h +++ b/include/configs/MPC8266ADS.h @@ -83,8 +83,7 @@   * for FCC)   *   * if CONFIG_ETHER_NONE is defined, then either the ethernet routines must be - * defined elsewhere (as for the console), or CFG_CMD_NET must be removed - * from CONFIG_COMMANDS to remove support for networking. + * defined elsewhere (as for the console), or CONFIG_CMD_NET must be unset.   */  #undef	CONFIG_ETHER_ON_SCC		/* define if ether on SCC   */  #define CONFIG_ETHER_ON_FCC		/* define if ether on FCC   */ diff --git a/include/configs/PM826.h b/include/configs/PM826.h index a93400d99..57d46acbc 100644 --- a/include/configs/PM826.h +++ b/include/configs/PM826.h @@ -103,8 +103,7 @@   *   - CONFIG_NET_MULTI must be defined   *   * if CONFIG_ETHER_NONE is defined, then either the ethernet routines must be - * defined elsewhere (as for the console), or CFG_CMD_NET must be removed - * from CONFIG_COMMANDS to remove support for networking. + * defined elsewhere (as for the console), or CONFIG_CMD_NET must be unset.   */  #define	CONFIG_NET_MULTI  #undef	CONFIG_ETHER_NONE		/* define if ether on something else */ diff --git a/include/configs/PM828.h b/include/configs/PM828.h index 5095a050a..3f1bb8e40 100644 --- a/include/configs/PM828.h +++ b/include/configs/PM828.h @@ -103,8 +103,7 @@   *   - CONFIG_NET_MULTI must be defined   *   * if CONFIG_ETHER_NONE is defined, then either the ethernet routines must be - * defined elsewhere (as for the console), or CFG_CMD_NET must be removed - * from CONFIG_COMMANDS to remove support for networking. + * defined elsewhere (as for the console), or CONFIG_CMD_NET must be unset.   */  #define CONFIG_NET_MULTI  #undef	CONFIG_ETHER_NONE		/* define if ether on something else */ diff --git a/include/configs/RPXsuper.h b/include/configs/RPXsuper.h index c39aff19b..1401da35a 100644 --- a/include/configs/RPXsuper.h +++ b/include/configs/RPXsuper.h @@ -91,8 +91,7 @@   * for FCC)   *   * if CONFIG_ETHER_NONE is defined, then either the ethernet routines must be - * defined elsewhere (as for the console), or CFG_CMD_NET must be removed - * from CONFIG_COMMANDS to remove support for networking. + * defined elsewhere (as for the console), or CONFIG_CMD_NET must be unset.   */  #undef  CONFIG_ETHER_ON_SCC           /* define if ethernet on SCC    */  #define CONFIG_ETHER_ON_FCC           /* define if ethernet on FCC    */ diff --git a/include/configs/Rattler.h b/include/configs/Rattler.h index 5c6431487..5bdf57193 100644 --- a/include/configs/Rattler.h +++ b/include/configs/Rattler.h @@ -62,8 +62,8 @@   * SCC, 1-3 for FCC)   *   * If CONFIG_ETHER_NONE is defined, then either the ethernet routines - * must be defined elsewhere (as for the console), or CFG_CMD_NET must - * be removed from CONFIG_COMMANDS to remove support for networking. + * must be defined elsewhere (as for the console), or CONFIG_CMD_NET + * must be unset.   */  #undef	CONFIG_ETHER_ON_SCC		/* Ethernet is not on SCC */  #define CONFIG_ETHER_ON_FCC		/* Ethernet is on FCC     */ diff --git a/include/configs/SCM.h b/include/configs/SCM.h index 67dbc55db..46861f838 100644 --- a/include/configs/SCM.h +++ b/include/configs/SCM.h @@ -133,8 +133,7 @@   * for FCC)   *   * if CONFIG_ETHER_NONE is defined, then either the ethernet routines must be - * defined elsewhere (as for the console), or CFG_CMD_NET must be removed - * from CONFIG_COMMANDS to remove support for networking. + * defined elsewhere (as for the console), or CONFIG_CMD_NET must be unset.   *   * (On TQM8260 either SCC1 or FCC2 may be chosen: SCC1 is hardwired to the   * X.29 connector, and FCC2 is hardwired to the X.1 connector) diff --git a/include/configs/TQM8260.h b/include/configs/TQM8260.h index 3089fefc3..ee5e6f762 100644 --- a/include/configs/TQM8260.h +++ b/include/configs/TQM8260.h @@ -167,8 +167,7 @@   * for FCC)   *   * if CONFIG_ETHER_NONE is defined, then either the ethernet routines must be - * defined elsewhere (as for the console), or CFG_CMD_NET must be removed - * from CONFIG_COMMANDS to remove support for networking. + * defined elsewhere (as for the console), or CONFIG_CMD_NET must be unset.   *   * (On TQM8260 either SCC1 or FCC2 may be chosen: SCC1 is hardwired to the   * X.29 connector, and FCC2 is hardwired to the X.1 connector) diff --git a/include/configs/TQM8272.h b/include/configs/TQM8272.h index b7a1baebc..a55aec276 100644 --- a/include/configs/TQM8272.h +++ b/include/configs/TQM8272.h @@ -177,8 +177,7 @@   * for FCC)   *   * if CONFIG_ETHER_NONE is defined, then either the ethernet routines must be - * defined elsewhere (as for the console), or CFG_CMD_NET must be removed - * from CONFIG_COMMANDS to remove support for networking. + * defined elsewhere (as for the console), or CONFIG_CMD_NET must be unset.   *   * (On TQM8272 either SCC1 or FCC2 may be chosen: SCC1 is hardwired to the   * X.29 connector, and FCC2 is hardwired to the X.1 connector) diff --git a/include/configs/VoVPN-GW.h b/include/configs/VoVPN-GW.h index 880624419..ebe634f13 100644 --- a/include/configs/VoVPN-GW.h +++ b/include/configs/VoVPN-GW.h @@ -95,8 +95,7 @@   * for FCC)   *   * if CONFIG_ETHER_NONE is defined, then either the ethernet routines must be - * defined elsewhere (as for the console), or CFG_CMD_NET must be removed - * from CONFIG_COMMANDS to remove support for networking. + * defined elsewhere (as for the console), or CONFIG_CMD_NET must be unset.   */  #undef	CONFIG_ETHER_ON_SCC  #define	CONFIG_ETHER_ON_FCC diff --git a/include/configs/ZPC1900.h b/include/configs/ZPC1900.h index 30c7790c8..fb5bc0fdb 100644 --- a/include/configs/ZPC1900.h +++ b/include/configs/ZPC1900.h @@ -55,8 +55,8 @@   * SCC, 1-3 for FCC)   *   * If CONFIG_ETHER_NONE is defined, then either the ethernet routines - * must be defined elsewhere (as for the console), or CFG_CMD_NET must - * be removed from CONFIG_COMMANDS to remove support for networking. + * must be defined elsewhere (as for the console), or CONFIG_CMD_NET + * must be unset.   */  #undef	CONFIG_ETHER_ON_SCC		/* Ethernet is not on SCC */  #define CONFIG_ETHER_ON_FCC		/* Ethernet is on FCC     */ diff --git a/include/configs/atc.h b/include/configs/atc.h index cb4e7472e..4f527fa40 100644 --- a/include/configs/atc.h +++ b/include/configs/atc.h @@ -64,9 +64,7 @@   * for FCC)   *   * if CONFIG_ETHER_NONE is defined, then either the ethernet routines must be - * defined elsewhere (as for the console), or CFG_CMD_NET must be removed - * from CONFIG_COMMANDS to remove support for networking. - * + * defined elsewhere (as for the console), or CONFIG_CMD_NET must be unset.   */  #undef	CONFIG_ETHER_ON_SCC		/* define if ether on SCC       */  #undef	CONFIG_ETHER_NONE		/* define if ether on something else */ diff --git a/include/configs/cogent_mpc8260.h b/include/configs/cogent_mpc8260.h index ac1baf3b4..63150902c 100644 --- a/include/configs/cogent_mpc8260.h +++ b/include/configs/cogent_mpc8260.h @@ -71,8 +71,7 @@   * for FCC)   *   * if CONFIG_ETHER_NONE is defined, then either the ethernet routines must be - * defined elsewhere (as for the console), or CFG_CMD_NET must be removed - * from CONFIG_COMMANDS to remove support for networking. + * defined elsewhere (as for the console), or CONFIG_CMD_NET must be unset.   */  #undef	CONFIG_ETHER_ON_SCC		/* define if ether on SCC	*/  #undef	CONFIG_ETHER_ON_FCC		/* define if ether on FCC	*/ diff --git a/include/configs/ep8248.h b/include/configs/ep8248.h index 44c4388b2..8653b55af 100644 --- a/include/configs/ep8248.h +++ b/include/configs/ep8248.h @@ -60,8 +60,8 @@   * SCC, 1-3 for FCC)   *   * If CONFIG_ETHER_NONE is defined, then either the ethernet routines - * must be defined elsewhere (as for the console), or CFG_CMD_NET must - * be removed from CONFIG_COMMANDS to remove support for networking. + * must be defined elsewhere (as for the console), or CONFIG_CMD_NET + * must be unset.   */  #undef	CONFIG_ETHER_ON_SCC		/* Ethernet is not on SCC */  #define CONFIG_ETHER_ON_FCC		/* Ethernet is on FCC     */ diff --git a/include/configs/ep8260.h b/include/configs/ep8260.h index 065f967e1..25f9bd6a7 100644 --- a/include/configs/ep8260.h +++ b/include/configs/ep8260.h @@ -183,8 +183,7 @@   * for FCC)   *   * if CONFIG_ETHER_NONE is defined, then either the ethernet routines must be - * defined elsewhere (as for the console), or CFG_CMD_NET must be removed - * from CONFIG_COMMANDS to remove support for networking. + * defined elsewhere (as for the console), or CONFIG_CMD_NET must be unset.   */  #undef  CONFIG_ETHER_ON_SCC           /* define if ethernet on SCC    */  #define CONFIG_ETHER_ON_FCC           /* define if ethernet on FCC    */ diff --git a/include/configs/ep82xxm.h b/include/configs/ep82xxm.h index 5fa70164e..430ff4b8f 100644 --- a/include/configs/ep82xxm.h +++ b/include/configs/ep82xxm.h @@ -60,8 +60,8 @@   * SCC, 1-3 for FCC)   *   * If CONFIG_ETHER_NONE is defined, then either the ethernet routines - * must be defined elsewhere (as for the console), or CFG_CMD_NET must - * be removed from CONFIG_COMMANDS to remove support for networking. + * must be defined elsewhere (as for the console), or CONFIG_CMD_NET + * must be unset.   */  #undef	CONFIG_ETHER_ON_SCC		/* Ethernet is not on SCC */  #define CONFIG_ETHER_ON_FCC		/* Ethernet is on FCC     */ diff --git a/include/configs/gw8260.h b/include/configs/gw8260.h index cf3eb3f5a..a8bc928b6 100644 --- a/include/configs/gw8260.h +++ b/include/configs/gw8260.h @@ -194,8 +194,7 @@   * for FCC)   *   * if CONFIG_ETHER_NONE is defined, then either the ethernet routines must be - * defined elsewhere (as for the console), or CFG_CMD_NET must be removed - * from CONFIG_COMMANDS to remove support for networking. + * defined elsewhere (as for the console), or CONFIG_CMD_NET must be unset.   */  #undef  CONFIG_ETHER_ON_SCC diff --git a/include/configs/hymod.h b/include/configs/hymod.h index 0fdfb1523..8a3ad6861 100644 --- a/include/configs/hymod.h +++ b/include/configs/hymod.h @@ -69,8 +69,7 @@   * for FCC)   *   * if CONFIG_ETHER_NONE is defined, then either the ethernet routines must be - * defined elsewhere (as for the console), or CFG_CMD_NET must be removed - * from CONFIG_COMMANDS to remove support for networking. + * defined elsewhere (as for the console), or CONFIG_CMD_NET must be unset.   */  #undef	CONFIG_ETHER_ON_SCC		/* define if ether on SCC	*/  #define	CONFIG_ETHER_ON_FCC		/* define if ether on FCC	*/ diff --git a/include/configs/ppmc8260.h b/include/configs/ppmc8260.h index d99da2fdb..610fcfdfe 100644 --- a/include/configs/ppmc8260.h +++ b/include/configs/ppmc8260.h @@ -169,8 +169,7 @@   * for FCC)   *   * if CONFIG_ETHER_NONE is defined, then either the ethernet routines must be - * defined elsewhere (as for the console), or CFG_CMD_NET must be removed - * from CONFIG_COMMANDS to remove support for networking. + * defined elsewhere (as for the console), or CONFIG_CMD_NET must be unset.   */  #undef	CONFIG_ETHER_ON_SCC		/* define if ethernet on SCC	*/ diff --git a/include/configs/rsdproto.h b/include/configs/rsdproto.h index 5ea76fe9b..93f5c6be8 100644 --- a/include/configs/rsdproto.h +++ b/include/configs/rsdproto.h @@ -64,8 +64,7 @@   * for FCC)   *   * if CONFIG_ETHER_NONE is defined, then either the ethernet routines must be - * defined elsewhere (as for the console), or CFG_CMD_NET must be removed - * from CONFIG_COMMANDS to remove support for networking. + * defined elsewhere (as for the console), or CONFIG_CMD_NET must be unset.   */  #undef	CONFIG_ETHER_ON_SCC		/* define if ethernet on SCC	*/  #define	CONFIG_ETHER_ON_FCC		/* define if ethernet on FCC	*/ diff --git a/include/configs/sacsng.h b/include/configs/sacsng.h index dc2583128..41f1f25fc 100644 --- a/include/configs/sacsng.h +++ b/include/configs/sacsng.h @@ -159,8 +159,7 @@   * for FCC)   *   * if CONFIG_ETHER_NONE is defined, then either the ethernet routines must be - * defined elsewhere (as for the console), or CFG_CMD_NET must be removed - * from CONFIG_COMMANDS to remove support for networking. + * defined elsewhere (as for the console), or CONFIG_CMD_NET must be unset.   */  #undef	CONFIG_ETHER_ON_SCC diff --git a/include/configs/sbc8260.h b/include/configs/sbc8260.h index 2a209d32b..bf6dab23d 100644 --- a/include/configs/sbc8260.h +++ b/include/configs/sbc8260.h @@ -182,8 +182,7 @@   * for FCC)   *   * if CONFIG_ETHER_NONE is defined, then either the ethernet routines must be - * defined elsewhere (as for the console), or CFG_CMD_NET must be removed - * from CONFIG_COMMANDS to remove support for networking. + * defined elsewhere (as for the console), or CONFIG_CMD_NET must be unset.   */  #undef	CONFIG_ETHER_ON_SCC diff --git a/include/configs/sc3.h b/include/configs/sc3.h index 578ef80aa..9709fe292 100644 --- a/include/configs/sc3.h +++ b/include/configs/sc3.h @@ -68,8 +68,7 @@   * Define IDE_USES_ISA_EMULATION for slower IDE access in the ISA-IO address range   * If undefined, IDE access uses a seperat emulation with higher access speed.   * Consider to inform your Linux IDE driver about the different addresses! - * IDE_USES_ISA_EMULATION is only used if your CONFIG_COMMANDS macro includes - * the CFG_CMD_IDE macro! + * IDE_USES_ISA_EMULATION is only used if you define CONFIG_CMD_IDE!   */  #define IDE_USES_ISA_EMULATION diff --git a/include/exports.h b/include/exports.h index 8a9b314cd..ad20502a6 100644 --- a/include/exports.h +++ b/include/exports.h @@ -23,7 +23,7 @@ void do_reset (void);  unsigned long simple_strtoul(const char *cp,char **endp,unsigned int base);  char *getenv (char *name);  void setenv (char *varname, char *varvalue); -#if (CONFIG_COMMANDS & CFG_CMD_I2C) || defined(CONFIG_CMD_I2C) +#if defined(CONFIG_CMD_I2C)  int i2c_write (uchar, uint, int , uchar* , int);  int i2c_read (uchar, uint, int , uchar* , int);  #endif	/* CFG_CMD_I2C */ diff --git a/include/lcd.h b/include/lcd.h index f0ec76aa3..8a4273cce 100644 --- a/include/lcd.h +++ b/include/lcd.h @@ -173,10 +173,10 @@ void	lcd_printf	(const char *fmt, ...);  /************************************************************************/  /* ** BITMAP DISPLAY SUPPORT						*/  /************************************************************************/ -#if (CONFIG_COMMANDS & CFG_CMD_BMP) || defined(CONFIG_CMD_BMP) || defined(CONFIG_SPLASH_SCREEN) +#if defined(CONFIG_CMD_BMP) || defined(CONFIG_SPLASH_SCREEN)  # include <bmp_layout.h>  # include <asm/byteorder.h> -#endif /* (CONFIG_COMMANDS & CFG_CMD_BMP) || CONFIG_SPLASH_SCREEN */ +#endif  /*   *  Information about displays we are using. This is for configuring diff --git a/include/mk48t59.h b/include/mk48t59.h index fbdb9f9d1..a4459c092 100644 --- a/include/mk48t59.h +++ b/include/mk48t59.h @@ -26,7 +26,7 @@   */ -#if defined(CONFIG_RTC_MK48T59) && ((CONFIG_COMMANDS & CFG_CMD_DATE) || defined(CONFIG_CMD_DATE)) +#if defined(CONFIG_RTC_MK48T59) && defined(CONFIG_CMD_DATE)  #define RTC_PORT_ADDR0		CFG_ISA_IO +  0x70  #define RTC_PORT_ADDR1		RTC_PORT_ADDR0 +  0x1 diff --git a/include/net.h b/include/net.h index 853f55a75..f6f33fff9 100644 --- a/include/net.h +++ b/include/net.h @@ -341,17 +341,17 @@ typedef enum { BOOTP, RARP, ARP, TFTP, DHCP, PING, DNS, NFS, CDP, NETCONS, SNTP  /* from net/net.c */  extern char	BootFile[128];			/* Boot File name		*/ -#if (CONFIG_COMMANDS & CFG_CMD_PING) || defined(CONFIG_CMD_PING) +#if defined(CONFIG_CMD_PING)  extern IPaddr_t	NetPingIP;			/* the ip address to ping 		*/  #endif -#if (CONFIG_COMMANDS & CFG_CMD_CDP) || defined(CONFIG_CMD_CDP) +#if defined(CONFIG_CMD_CDP)  /* when CDP completes these hold the return values */  extern ushort CDPNativeVLAN;  extern ushort CDPApplianceVLAN;  #endif -#if (CONFIG_COMMANDS & CFG_CMD_SNTP) || defined(CONFIG_CMD_SNTP) +#if defined(CONFIG_CMD_SNTP)  extern IPaddr_t	NetNtpServerIP;			/* the ip address to NTP 	*/  extern int NetTimeOffset;			/* offset time from UTC		*/  #endif diff --git a/include/pcmcia.h b/include/pcmcia.h index 60794f90e..c028ab735 100644 --- a/include/pcmcia.h +++ b/include/pcmcia.h @@ -31,8 +31,8 @@   * Allow configuration to select PCMCIA slot,   * or try to generate a useful default   */ -#if (CONFIG_COMMANDS & CFG_CMD_PCMCIA) || defined(CONFIG_CMD_PCMCIA) || \ -    (((CONFIG_COMMANDS & CFG_CMD_IDE) || defined(CONFIG_CMD_IDE)) && \ +#if defined(CONFIG_CMD_PCMCIA) || \ +    (defined(CONFIG_CMD_IDE) && \  	(defined(CONFIG_IDE_8xx_PCCARD) || defined(CONFIG_IDE_8xx_DIRECT) ) )  #if !defined(CONFIG_PCMCIA_SLOT_A) && !defined(CONFIG_PCMCIA_SLOT_B) @@ -313,7 +313,7 @@ extern u_int *pcmcia_pgcrx[];  #define	PCMCIA_PGCRX(slot)	(*pcmcia_pgcrx[slot])  #endif -#if ((CONFIG_COMMANDS & CFG_CMD_IDE) || defined(CONFIG_CMD_IDE)) && defined(CONFIG_IDE_8xx_PCCARD) \ +#if defined(CONFIG_CMD_IDE) && defined(CONFIG_IDE_8xx_PCCARD) \  	|| defined(CONFIG_PXA_PCMCIA)  extern int check_ide_device(int slot);  #endif |