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 with git://www.denx.de/git/u-boot.git
[platform/kernel/u-boot.git]
/
disk
/
part_amiga.c
diff --git
a/disk/part_amiga.c
b/disk/part_amiga.c
index
41e68fc
..
6c3d748
100644
(file)
--- a/
disk/part_amiga.c
+++ b/
disk/part_amiga.c
@@
-26,9
+26,9
@@
#include <ide.h>
#include "part_amiga.h"
#include <ide.h>
#include "part_amiga.h"
-#if (
(CONFIG_COMMANDS & CFG_CMD_IDE)
|| \
-
(CONFIG_COMMANDS & CFG_CMD_SCSI)
|| \
-
(CONFIG_COMMANDS & CFG_CMD_USB)
|| \
+#if (
defined(CONFIG_CMD_IDE)
|| \
+
defined(CONFIG_CMD_SCSI)
|| \
+
defined(CONFIG_CMD_USB)
|| \
defined(CONFIG_MMC) || \
defined(CONFIG_SYSTEMACE) ) && defined(CONFIG_AMIGA_PARTITION)
defined(CONFIG_MMC) || \
defined(CONFIG_SYSTEMACE) ) && defined(CONFIG_AMIGA_PARTITION)