diff options
| author | Kim Phillips <kim.phillips@freescale.com> | 2009-02-19 11:06:58 -0600 |
|---|---|---|
| committer | Kim Phillips <kim.phillips@freescale.com> | 2009-02-19 11:06:58 -0600 |
| commit | 7511835b29f2074ebfa8ea794f0303ec8e49542b (patch) | |
| tree | 0a0f8539a467c897ea0f33ec0b17b8b664e7c7e3 /disk/part_efi.c | |
| parent | 2b68b23373f96199a0cafbfd7a9f79ed62381ebb (diff) | |
| parent | 32482be67775e00b4cbc49fba62347c1ecc6229c (diff) | |
| download | olio-uboot-2014.01-7511835b29f2074ebfa8ea794f0303ec8e49542b.tar.xz olio-uboot-2014.01-7511835b29f2074ebfa8ea794f0303ec8e49542b.zip | |
Merge branch 'master' of git://git.denx.de/u-boot
Diffstat (limited to 'disk/part_efi.c')
| -rw-r--r-- | disk/part_efi.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/disk/part_efi.c b/disk/part_efi.c index d8a81115c..70f62cc9a 100644 --- a/disk/part_efi.c +++ b/disk/part_efi.c @@ -36,12 +36,12 @@ #include <malloc.h> #include "part_efi.h" -#if (defined(CONFIG_CMD_IDE) || \ - defined(CONFIG_CMD_SATA) || \ - defined(CONFIG_CMD_SCSI) || \ - defined(CONFIG_CMD_USB) || \ - defined(CONFIG_MMC) || \ - defined(CONFIG_SYSTEMACE) ) && defined(CONFIG_EFI_PARTITION) +#if defined(CONFIG_CMD_IDE) || \ + defined(CONFIG_CMD_SATA) || \ + defined(CONFIG_CMD_SCSI) || \ + defined(CONFIG_CMD_USB) || \ + defined(CONFIG_MMC) || \ + defined(CONFIG_SYSTEMACE) /* Convert char[2] in little endian format to the host format integer */ |