Merge tag 'u-boot-amlogic-20200618' of https://gitlab.denx.de/u-boot/custodians/u...

[oweals/u-boot.git] / cmd / ide.c

diff --git a/cmd/ide.c b/cmd/ide.c
index 1c58efc55ac04adc261aad8520f05f17e74de08d..b78c38e1590d78702831c506471afa56e33ad482 100644 (file)
--- a/cmd/ide.c
+++ b/cmd/ide.c
@@ -17,10 +17,6 @@
 #include <asm/byteorder.h>
 #include <asm/io.h>
 
-#if defined(CONFIG_IDE_PCMCIA)
-# include <pcmcia.h>
-#endif
-
 #include <ide.h>
 #include <ata.h>
 
@@ -31,7 +27,7 @@
 /* Current I/O Device  */
 static int curr_device;
 
-int do_ide(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[])
+int do_ide(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
 {
        if (argc == 2) {
                if (strncmp(argv[1], "res", 3) == 0) {
@@ -44,7 +40,7 @@ int do_ide(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[])
        return blk_common_cmd(argc, argv, IF_TYPE_IDE, &curr_device);
 }
 
-int do_diskboot(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[])
+int do_diskboot(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
 {
        return common_diskboot(cmdtp, "ide", argc, argv);
 }