diff options
author | Stefan Roese <sr@denx.de> | 2007-08-14 16:36:29 +0200 |
---|---|---|
committer | Stefan Roese <sr@denx.de> | 2007-08-14 16:36:29 +0200 |
commit | 3b3bff4cbf2cb14f9a3e7d03f26ebab900efe4ae (patch) | |
tree | fb66bf8861d9f78765160d734a438856f5317cdb /board/esd/cpci5200/cpci5200.c | |
parent | 4ce846ec59f36b85d6644a769690ad3feb667575 (diff) | |
parent | 4ef35e53c693556c54b0c22d6f873de87bade253 (diff) | |
download | talos-obmc-uboot-3b3bff4cbf2cb14f9a3e7d03f26ebab900efe4ae.tar.gz talos-obmc-uboot-3b3bff4cbf2cb14f9a3e7d03f26ebab900efe4ae.zip |
Merge with git://www.denx.de/git/u-boot.git
Diffstat (limited to 'board/esd/cpci5200/cpci5200.c')
-rw-r--r-- | board/esd/cpci5200/cpci5200.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/board/esd/cpci5200/cpci5200.c b/board/esd/cpci5200/cpci5200.c index a925b84fd9..adb8597e1c 100644 --- a/board/esd/cpci5200/cpci5200.c +++ b/board/esd/cpci5200/cpci5200.c @@ -196,7 +196,7 @@ void pci_init_board(void) { } #endif -#if defined (CFG_CMD_IDE) && defined (CONFIG_IDE_RESET) +#if defined(CONFIG_CMD_IDE) && defined (CONFIG_IDE_RESET) void init_ide_reset(void) { @@ -217,7 +217,7 @@ void ide_set_reset(int idereset) *(vu_long *) MPC5XXX_WU_GPIO_DATA_O |= GPIO_PSC1_4; } } -#endif /* defined (CFG_CMD_IDE) && defined (CONFIG_IDE_RESET) */ +#endif #define MPC5XXX_SIMPLEIO_GPIO_ENABLE (MPC5XXX_GPIO + 0x0004) #define MPC5XXX_SIMPLEIO_GPIO_DIR (MPC5XXX_GPIO + 0x000C) |