git.openpandora.org
/
pandora-u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of /home/wd/git/u-boot/master
[pandora-u-boot.git]
/
disk
/
part_mac.c
diff --git
a/disk/part_mac.c
b/disk/part_mac.c
index
087133d
..
bebe415
100644
(file)
--- a/
disk/part_mac.c
+++ b/
disk/part_mac.c
@@
-32,10
+32,15
@@
#include <common.h>
#include <command.h>
#include <ide.h>
#include <common.h>
#include <command.h>
#include <ide.h>
-#include <cmd_disk.h>
#include "part_mac.h"
#include "part_mac.h"
-#if ((CONFIG_COMMANDS & CFG_CMD_IDE) || (CONFIG_COMMANDS & CFG_CMD_SCSI)) && defined(CONFIG_MAC_PARTITION)
+#if defined(CONFIG_CMD_IDE) || \
+ defined(CONFIG_CMD_MG_DISK) || \
+ defined(CONFIG_CMD_SCSI) || \
+ defined(CONFIG_CMD_SATA) || \
+ defined(CONFIG_CMD_USB) || \
+ defined(CONFIG_MMC) || \
+ defined(CONFIG_SYSTEMACE)
/* stdlib.h causes some compatibility problems; should fixe these! -- wd */
#ifndef __ldiv_t_defined
/* stdlib.h causes some compatibility problems; should fixe these! -- wd */
#ifndef __ldiv_t_defined
@@
-248,4
+253,4
@@
int get_partition_info_mac (block_dev_desc_t *dev_desc, int part, disk_partition
return (0);
}
return (0);
}
-#endif
/* (CONFIG_COMMANDS & CFG_CMD_IDE) && CONFIG_MAC_PARTITION */
+#endif