diff options
| author | Stefan Roese <sr@denx.de> | 2007-06-22 10:28:26 +0200 |
|---|---|---|
| committer | Stefan Roese <sr@denx.de> | 2007-06-22 10:28:26 +0200 |
| commit | e08e6453fced498b28950f36088c87c0b639a682 (patch) | |
| tree | 5730c11e7440a6b88094d050172b8e5b4b707fbd /disk/part.c | |
| parent | d7d5204ce2e0985ff2dfdf3a6b5b6a526cdb1c1e (diff) | |
| parent | 83b4cfa3d629dff0264366263c5e94d9a50ad80b (diff) | |
| download | u-boot-imx-e08e6453fced498b28950f36088c87c0b639a682.zip u-boot-imx-e08e6453fced498b28950f36088c87c0b639a682.tar.gz u-boot-imx-e08e6453fced498b28950f36088c87c0b639a682.tar.bz2 | |
Merge with git://www.denx.de/git/u-boot.git
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..255b140 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) */ |