summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2008-02-12 00:56:25 +0100
committerWolfgang Denk <wd@denx.de>2008-02-12 00:56:25 +0100
commit10bbb38a402a2faf18858c451bcdc63d45888e6e (patch)
tree62d7fe35b4406f236678b62f0e09771af2fb5edf /drivers
parentac2731f185ee4b7f56998c8f26d181f66fad84f8 (diff)
parent4c309625e796f953f1af54d3b09f8b9d6d9fdc00 (diff)
downloadtalos-obmc-uboot-10bbb38a402a2faf18858c451bcdc63d45888e6e.tar.gz
talos-obmc-uboot-10bbb38a402a2faf18858c451bcdc63d45888e6e.zip
Merge branch 'master' of /home/wd/git/u-boot/custodians
Diffstat (limited to 'drivers')
-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 a3d1c95515..2fe838c45d 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 */
OpenPOWER on IntegriCloud