summaryrefslogtreecommitdiff
path: root/drivers/spi
diff options
context:
space:
mode:
authorJon Loeliger <jdl@freescale.com>2008-02-13 16:03:20 -0600
committerJon Loeliger <jdl@freescale.com>2008-02-13 16:03:20 -0600
commitd075eec500acffed5fa404a45a3e12e158d0cb33 (patch)
tree2cecaae4e1c324827caa65d6c5215642ed4a91ed /drivers/spi
parent60c1b95aabbfac17b0ea9422828784e163348c5c (diff)
parent10bbb38a402a2faf18858c451bcdc63d45888e6e (diff)
downloadu-boot-imx-d075eec500acffed5fa404a45a3e12e158d0cb33.zip
u-boot-imx-d075eec500acffed5fa404a45a3e12e158d0cb33.tar.gz
u-boot-imx-d075eec500acffed5fa404a45a3e12e158d0cb33.tar.bz2
Merge commit 'wd/master'
Diffstat (limited to 'drivers/spi')
-rw-r--r--drivers/spi/mpc8xxx_spi.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/spi/mpc8xxx_spi.c b/drivers/spi/mpc8xxx_spi.c
index a3d1c95..2fe838c 100644
--- a/drivers/spi/mpc8xxx_spi.c
+++ b/drivers/spi/mpc8xxx_spi.c
@@ -22,11 +22,11 @@
*/
#include <common.h>
+#if defined(CONFIG_MPC8XXX_SPI) && defined(CONFIG_HARD_SPI)
+
#include <spi.h>
#include <asm/mpc8xxx_spi.h>
-#ifdef CONFIG_HARD_SPI
-
#define SPI_EV_NE (0x80000000 >> 22) /* Receiver Not Empty */
#define SPI_EV_NF (0x80000000 >> 23) /* Transmitter Not Full */