diff options
| author | Michael Brandt <Michael.Brandt@stericsson.com> | 2009-11-30 10:43:04 +0100 |
|---|---|---|
| committer | Michael Brandt <Michael.Brandt@stericsson.com> | 2009-11-30 10:43:04 +0100 |
| commit | 4f47f2f1c8c46ac87c4e0a5708f950fdb59a2a17 (patch) | |
| tree | 593eeada2af1ddf0368e7e546a8d8d8ed5f3f027 /include | |
| parent | b926de66e515762d2ccbc6b79185305b88e46218 (diff) | |
| parent | 824d82997fbcf28e49081d36fdd5d3be1b92b03d (diff) | |
Merge branch 'master' of http://git.denx.de/u-boot
Diffstat (limited to 'include')
| -rw-r--r-- | include/image.h | 2 | ||||
| -rw-r--r-- | include/spi_flash.h | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/include/image.h b/include/image.h index 5a424e6a9..04b62d154 100644 --- a/include/image.h +++ b/include/image.h @@ -219,12 +219,10 @@ typedef struct bootm_headers { const char *fit_uname_rd; /* init ramdisk subimage node unit name */ int fit_noffset_rd; /* init ramdisk subimage node offset */ -#if defined(CONFIG_PPC) void *fit_hdr_fdt; /* FDT blob FIT image header */ const char *fit_uname_fdt; /* FDT blob subimage node unit name */ int fit_noffset_fdt;/* FDT blob subimage node offset */ #endif -#endif #ifndef USE_HOSTCC image_info_t os; /* os image info */ diff --git a/include/spi_flash.h b/include/spi_flash.h index de4f174ad..1f8ba2987 100644 --- a/include/spi_flash.h +++ b/include/spi_flash.h @@ -24,6 +24,7 @@ #define _SPI_FLASH_H_ #include <spi.h> +#include <linux/types.h> struct spi_flash_region { unsigned int count; |