summaryrefslogtreecommitdiff
path: root/disk/part.c
diff options
context:
space:
mode:
authorMichal Simek <monstr@monstr.eu>2007-07-13 21:39:13 +0200
committerMichal Simek <monstr@monstr.eu>2007-07-13 21:39:13 +0200
commitbc2962482b707e44e0b43d20bd4dcf2a40230abb (patch)
tree751c5e07c5ff0aa7910da0fe33b0a0996bda518c /disk/part.c
parent093172f08d6afb3f34d8a2f26ee0ee874261cf27 (diff)
parent239f05ee4dd4cfe0b50f251b533dcebe9e67c360 (diff)
Merge git://www.denx.de/git/u-boot
Diffstat (limited to 'disk/part.c')
-rwxr-xr-xdisk/part.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/disk/part.c b/disk/part.c
index 255b140698..6ab5857073 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) {