]> git.kernelconcepts.de Git - karo-tx-uboot.git/commitdiff
remove CONFIG_SC3 from cmd_ide.c
authorPavel Herrmann <morpheus.ibis@gmail.com>
Sun, 7 Oct 2012 05:56:05 +0000 (05:56 +0000)
committerTom Rini <trini@ti.com>
Wed, 17 Oct 2012 14:59:08 +0000 (07:59 -0700)
There is no difference in codepath with CONFIG_SC3 enabled, so just remove it

Signed-off-by: Pavel Herrmann <morpheus.ibis@gmail.com>
common/cmd_ide.c

index bae7767310fc7e479f27ead114a42e602b6b089b..11e9eacf77d2073751d8363248b37bca5fe1777f 100644 (file)
@@ -400,9 +400,6 @@ void ide_init(void)
        unsigned char c;
        int i, bus;
 
-#if defined(CONFIG_SC3)
-       unsigned int ata_reset_time = ATA_RESET_TIME;
-#endif
 #ifdef CONFIG_IDE_8xx_PCCARD
        extern int pcmcia_on(void);
        extern int ide_devices_found;   /* Initialized in check_ide_device() */
@@ -502,11 +499,7 @@ void ide_init(void)
 
                        c = ide_inb(dev, ATA_STATUS);
                        i++;
-#if defined(CONFIG_SC3)
-                       if (i > (ata_reset_time * 100)) {
-#else
                        if (i > (ATA_RESET_TIME * 100)) {
-#endif
                                puts("** Timeout **\n");
                                /* LED's off */
                                ide_led((LED_IDE1 | LED_IDE2), 0);