diff options
author | John Rigby <jrigby@freescale.com> | 2007-07-10 14:58:41 -0600 |
---|---|---|
committer | John Rigby <jrigby@freescale.com> | 2007-07-10 14:58:41 -0600 |
commit | 98c80b462f9532f3ff6a62dd9629023b48627a6d (patch) | |
tree | bea13c7b7f892aa5875e737bd52535be50d96d25 /disk | |
parent | 0dca874db62718e41253659e60f3a1de7eb418ce (diff) | |
parent | 4ef218f6fdf8d747f4589da5252b004e7d2c2876 (diff) | |
download | u-boot-imx-98c80b462f9532f3ff6a62dd9629023b48627a6d.zip u-boot-imx-98c80b462f9532f3ff6a62dd9629023b48627a6d.tar.gz u-boot-imx-98c80b462f9532f3ff6a62dd9629023b48627a6d.tar.bz2 |
Merge branch 'master' into u-boot-5329-early
Diffstat (limited to 'disk')
-rwxr-xr-x | disk/part.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/disk/part.c b/disk/part.c index 255b140..6ab5857 100755 --- a/disk/part.c +++ b/disk/part.c @@ -180,7 +180,6 @@ 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) || \ @@ -223,7 +222,7 @@ 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) { - switch (dev_desc->part_type) { + switch (dev_desc->part_type) { #ifdef CONFIG_MAC_PARTITION case PART_TYPE_MAC: if (get_partition_info_mac(dev_desc,part,info) == 0) { |