diff options
| author | Stefan Roese <sr@denx.de> | 2007-06-22 10:28:26 +0200 |
|---|---|---|
| committer | Stefan Roese <sr@denx.de> | 2007-06-22 10:28:26 +0200 |
| commit | e08e6453fced498b28950f36088c87c0b639a682 (patch) | |
| tree | 5730c11e7440a6b88094d050172b8e5b4b707fbd /common/cmd_ide.c | |
| parent | d7d5204ce2e0985ff2dfdf3a6b5b6a526cdb1c1e (diff) | |
| parent | 83b4cfa3d629dff0264366263c5e94d9a50ad80b (diff) | |
| download | u-boot-imx-e08e6453fced498b28950f36088c87c0b639a682.zip u-boot-imx-e08e6453fced498b28950f36088c87c0b639a682.tar.gz u-boot-imx-e08e6453fced498b28950f36088c87c0b639a682.tar.bz2 | |
Merge with git://www.denx.de/git/u-boot.git
Diffstat (limited to 'common/cmd_ide.c')
| -rw-r--r-- | common/cmd_ide.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/common/cmd_ide.c b/common/cmd_ide.c index ce99a41..e308474 100644 --- a/common/cmd_ide.c +++ b/common/cmd_ide.c @@ -514,11 +514,11 @@ void ide_init (void) unsigned char c; int i, bus; #if defined(CONFIG_AMIGAONEG3SE) || defined(CONFIG_SC3) - unsigned int ata_reset_time; + unsigned int ata_reset_time = ATA_RESET_TIME; + char *s; #endif #ifdef CONFIG_AMIGAONEG3SE unsigned int max_bus_scan; - char *s; #endif #ifdef CONFIG_IDE_8xx_PCCARD extern int pcmcia_on (void); |