diff options
| author | Wolfgang Denk <wd@denx.de> | 2007-06-06 16:18:01 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2007-06-06 16:18:01 +0200 |
| commit | d1246a4bb1ae9502ff540291423f1bb02d1e808c (patch) | |
| tree | 3e71ba3824187fc2334d906ed87cb22f922b9169 /disk/part.c | |
| parent | 1cf67563333b1ae12e9fe19fcdff0c9b220e822a (diff) | |
| parent | 7bfebfe484137afcbc0b5e39928dd6243ae3ef68 (diff) | |
| download | u-boot-imx-d1246a4bb1ae9502ff540291423f1bb02d1e808c.zip u-boot-imx-d1246a4bb1ae9502ff540291423f1bb02d1e808c.tar.gz u-boot-imx-d1246a4bb1ae9502ff540291423f1bb02d1e808c.tar.bz2 | |
Merge with /home/wd/git/u-boot/custodian/u-boot-arm
Diffstat (limited to 'disk/part.c')
| -rwxr-xr-x[-rw-r--r--] | disk/part.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/disk/part.c b/disk/part.c index acc1a74..61e6579 100644..100755 --- a/disk/part.c +++ b/disk/part.c @@ -180,6 +180,7 @@ void dev_print (block_dev_desc_t *dev_desc) (CONFIG_COMMANDS & CFG_CMD_SCSI) || \ (CONFIG_COMMANDS & CFG_CMD_USB) || \ defined(CONFIG_MMC) || \ + (defined(CONFIG_MMC) && defined(CONFIG_LPC2292)) || \ defined(CONFIG_SYSTEMACE) ) #if defined(CONFIG_MAC_PARTITION) || \ @@ -219,7 +220,8 @@ void init_part (block_dev_desc_t * dev_desc) } -int get_partition_info (block_dev_desc_t *dev_desc, int part, disk_partition_t *info) +int get_partition_info (block_dev_desc_t *dev_desc, int part + , disk_partition_t *info) { switch (dev_desc->part_type) { #ifdef CONFIG_MAC_PARTITION @@ -325,7 +327,8 @@ void print_part (block_dev_desc_t * dev_desc) #else /* neither MAC nor DOS nor ISO partition configured */ -# error neither CONFIG_MAC_PARTITION nor CONFIG_DOS_PARTITION nor CONFIG_ISO_PARTITION configured! +# error neither CONFIG_MAC_PARTITION nor CONFIG_DOS_PARTITION +# error nor CONFIG_ISO_PARTITION configured! #endif #endif /* (CONFIG_COMMANDS & CFG_CMD_IDE) || CONFIG_COMMANDS & CFG_CMD_SCSI) */ |