diff options
| author | Jon Loeliger <jdl@freescale.com> | 2008-07-10 12:05:32 -0500 |
|---|---|---|
| committer | Jon Loeliger <jdl@freescale.com> | 2008-07-10 12:05:32 -0500 |
| commit | 859f24350e6e4313626f85161dd03f025a4dac59 (patch) | |
| tree | a025f68619045556e662326c8e1cbc147f9b633e /drivers/spi/mpc8xxx_spi.c | |
| parent | 3473ab737282b08ad61841fcbb14c4d264a93a8e (diff) | |
| parent | e0320b1ebec13755911a53b0af12cbf3e5e49a65 (diff) | |
| download | u-boot-imx-859f24350e6e4313626f85161dd03f025a4dac59.zip u-boot-imx-859f24350e6e4313626f85161dd03f025a4dac59.tar.gz u-boot-imx-859f24350e6e4313626f85161dd03f025a4dac59.tar.bz2 | |
Merge commit 'wd/master'
Diffstat (limited to 'drivers/spi/mpc8xxx_spi.c')
| -rw-r--r-- | drivers/spi/mpc8xxx_spi.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/spi/mpc8xxx_spi.c b/drivers/spi/mpc8xxx_spi.c index 136fb50..9eaf986 100644 --- a/drivers/spi/mpc8xxx_spi.c +++ b/drivers/spi/mpc8xxx_spi.c @@ -22,7 +22,6 @@ */ #include <common.h> -#if defined(CONFIG_MPC8XXX_SPI) && defined(CONFIG_HARD_SPI) #include <malloc.h> #include <spi.h> @@ -180,4 +179,3 @@ int spi_xfer(struct spi_slave *slave, unsigned int bitlen, const void *dout, return 0; } -#endif /* CONFIG_HARD_SPI */ |