diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-06-19 12:53:59 +0200 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-06-19 12:53:59 +0200 |
| commit | 69f14dc2fd64307f012381dd333a06001dec75dc (patch) | |
| tree | 1c520dfb9afd8406230a5382ebaf57b0b8cd6c5d /drivers/mtd/spi/spi_flash_internal.h | |
| parent | 847e6693ccb529bf8346db62876f38f0c4e04ade (diff) | |
| parent | ed7bdc03eb516fb698ccc12ec5b4b9f132d05c5f (diff) | |
| download | olio-uboot-2014.01-69f14dc2fd64307f012381dd333a06001dec75dc.tar.xz olio-uboot-2014.01-69f14dc2fd64307f012381dd333a06001dec75dc.zip | |
Merge branch 'u-boot-samsung/master' into 'u-boot-arm/master'
Conflicts:
spl/Makefile
Diffstat (limited to 'drivers/mtd/spi/spi_flash_internal.h')
| -rw-r--r-- | drivers/mtd/spi/spi_flash_internal.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/mtd/spi/spi_flash_internal.h b/drivers/mtd/spi/spi_flash_internal.h index 141cfa8b2..e0afbc3d8 100644 --- a/drivers/mtd/spi/spi_flash_internal.h +++ b/drivers/mtd/spi/spi_flash_internal.h @@ -106,3 +106,4 @@ struct spi_flash *spi_flash_probe_sst(struct spi_slave *spi, u8 *idcode); struct spi_flash *spi_flash_probe_stmicro(struct spi_slave *spi, u8 *idcode); struct spi_flash *spi_flash_probe_winbond(struct spi_slave *spi, u8 *idcode); struct spi_flash *spi_fram_probe_ramtron(struct spi_slave *spi, u8 *idcode); +struct spi_flash *spi_flash_probe_gigadevice(struct spi_slave *spi, u8 *idcode); |