diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-04-04 15:44:57 +0200 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-04-04 15:44:57 +0200 |
| commit | fed029f3c31b7d5df674b5090a13356b631918c7 (patch) | |
| tree | f1948b23396505a4f5568ab9d37800235b815e0b /drivers/spi | |
| parent | be08abc2429c2e9cbce3d0abc1d315171d683520 (diff) | |
| parent | 4fdebefa453a58c7b4ca653ab40f7a9791aba6c9 (diff) | |
| download | u-boot-imx-fed029f3c31b7d5df674b5090a13356b631918c7.zip u-boot-imx-fed029f3c31b7d5df674b5090a13356b631918c7.tar.gz u-boot-imx-fed029f3c31b7d5df674b5090a13356b631918c7.tar.bz2 | |
Merge branch 'u-boot-samsung/master' into 'u-boot-arm/master'
Diffstat (limited to 'drivers/spi')
| -rw-r--r-- | drivers/spi/exynos_spi.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/spi/exynos_spi.c b/drivers/spi/exynos_spi.c index 51b3d30..607e1cd 100644 --- a/drivers/spi/exynos_spi.c +++ b/drivers/spi/exynos_spi.c @@ -358,6 +358,7 @@ static inline struct exynos_spi *get_spi_base(int dev_index) * @param bus SPI bus structure to fill with information * @return 0 if ok, or -FDT_ERR_NOTFOUND if something was missing */ +#ifdef CONFIG_OF_CONTROL static int spi_get_config(const void *blob, int node, struct spi_bus *bus) { bus->node = node; @@ -413,6 +414,7 @@ static int process_nodes(const void *blob, int node_list[], int count) return 0; } +#endif /* Sadly there is no error return from this function */ void spi_init(void) |