diff options
author | Stefan Roese <sr@denx.de> | 2007-08-14 15:00:42 +0200 |
---|---|---|
committer | Stefan Roese <sr@denx.de> | 2007-08-14 15:00:42 +0200 |
commit | 34886bbea20b577e8bdef81f3831319f1876b9b7 (patch) | |
tree | 06d3819c6f50eda7079645da8db458956a5781f3 /common | |
parent | 273db7e1bdd1937e32f1d4507321bb721ebd3118 (diff) | |
parent | 779e975117a75e91fcebe226a63104dbfb924ab1 (diff) | |
download | u-boot-imx-34886bbea20b577e8bdef81f3831319f1876b9b7.zip u-boot-imx-34886bbea20b577e8bdef81f3831319f1876b9b7.tar.gz u-boot-imx-34886bbea20b577e8bdef81f3831319f1876b9b7.tar.bz2 |
Merge with /home/stefan/git/u-boot/zeus
Diffstat (limited to 'common')
-rw-r--r-- | common/soft_spi.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/common/soft_spi.c b/common/soft_spi.c index 00a57de..e425061 100644 --- a/common/soft_spi.c +++ b/common/soft_spi.c @@ -79,7 +79,9 @@ void spi_init (void) */ int spi_xfer(spi_chipsel_type chipsel, int bitlen, uchar *dout, uchar *din) { +#ifdef CFG_IMMR volatile immap_t *immr = (immap_t *)CFG_IMMR; +#endif uchar tmpdin = 0; uchar tmpdout = 0; int j; |