projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'inka4x0-ng' of /home/m8/git/u-boot/
[platform/kernel/u-boot.git]
/
common
/
cmd_ide.c
diff --git
a/common/cmd_ide.c
b/common/cmd_ide.c
index
2202009
..
c38be4f
100644
(file)
--- a/
common/cmd_ide.c
+++ b/
common/cmd_ide.c
@@
-68,8
+68,6
@@
DECLARE_GLOBAL_DATA_PTR;
# define SYNC /* nothing */
#endif
# define SYNC /* nothing */
#endif
-#if defined(CONFIG_CMD_IDE)
-
#ifdef CONFIG_IDE_8xx_DIRECT
/* Timings for IDE Interface
*
#ifdef CONFIG_IDE_8xx_DIRECT
/* Timings for IDE Interface
*
@@
-888,7
+886,7
@@
input_swap_data(int dev, ulong *sect_buf, int words)
#endif /* __LITTLE_ENDIAN || CONFIG_AU1X00 */
#endif /* __LITTLE_ENDIAN || CONFIG_AU1X00 */
-#if defined(__PPC__) || defined(CONFIG_PXA_PCMCIA)
+#if defined(__PPC__) || defined(CONFIG_PXA_PCMCIA)
|| defined(CONFIG_SH)
static void
output_data(int dev, ulong *sect_buf, int words)
{
static void
output_data(int dev, ulong *sect_buf, int words)
{
@@
-940,7
+938,7
@@
output_data(int dev, ulong *sect_buf, int words)
}
#endif /* __PPC__ */
}
#endif /* __PPC__ */
-#if defined(__PPC__) || defined(CONFIG_PXA_PCMCIA)
+#if defined(__PPC__) || defined(CONFIG_PXA_PCMCIA)
|| defined(CONFIG_SH)
static void
input_data(int dev, ulong *sect_buf, int words)
{
static void
input_data(int dev, ulong *sect_buf, int words)
{
@@
-2081,5
+2079,3
@@
U_BOOT_CMD(
"diskboot- boot from IDE device\n",
"loadAddr dev:part\n"
);
"diskboot- boot from IDE device\n",
"loadAddr dev:part\n"
);
-
-#endif