diff options
| author | Wolfgang Denk <wd@denx.de> | 2007-08-06 00:55:51 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2007-08-06 00:55:51 +0200 |
| commit | 46919751eac7d5c210e6e71ad4bf2bae4805902e (patch) | |
| tree | 5a6097aef0f398adb4e60047efb28c37b79bec50 /disk/part.c | |
| parent | 8092fef4c29b395958bb649647da7e3775731517 (diff) | |
| parent | c7e717ebc2b044d7a71062552c9dc0f54ea9b779 (diff) | |
| download | u-boot-imx-46919751eac7d5c210e6e71ad4bf2bae4805902e.zip u-boot-imx-46919751eac7d5c210e6e71ad4bf2bae4805902e.tar.gz u-boot-imx-46919751eac7d5c210e6e71ad4bf2bae4805902e.tar.bz2 | |
Merge with /home/wd/git/u-boot/custodian/u-boot-mpc85xx
Diffstat (limited to 'disk/part.c')
| -rw-r--r-- | disk/part.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/disk/part.c b/disk/part.c index 0e772ee..56b9427 100644 --- a/disk/part.c +++ b/disk/part.c @@ -180,7 +180,6 @@ void dev_print (block_dev_desc_t *dev_desc) defined(CONFIG_CMD_SCSI) || \ defined(CONFIG_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) { |