Merge branch 'master' of git://git.denx.de/u-boot-sunxi

[u-boot] / cmd / pcmcia.c

diff --git a/cmd/pcmcia.c b/cmd/pcmcia.c
index 044fb9e6189466f246bbe412294e9d79e6702a3e..3b7537b1051102495c422ed76fa85ea8109f95cf 100644 (file)
--- a/cmd/pcmcia.c
+++ b/cmd/pcmcia.c
@@ -1,9 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2000-2006
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
  *
- * SPDX-License-Identifier:    GPL-2.0+
- *
  ********************************************************************
  *
  * Lots of code copied from:
@@ -83,10 +82,6 @@ U_BOOT_CMD(
 
 #undef CHECK_IDE_DEVICE
 
-#if defined(CONFIG_IDE) && defined(CONFIG_IDE_8xx_PCCARD)
-#define        CHECK_IDE_DEVICE
-#endif
-
 #if    defined(CONFIG_PXA_PCMCIA)
 #define        CHECK_IDE_DEVICE
 #endif