summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorBen Warren <biggerbadderben@gmail.com>2008-06-08 23:28:33 -0700
committerWolfgang Denk <wd@denx.de>2008-07-01 21:02:11 +0200
commitf8cc312bbee69257d741dc9f4062f4a0f5adf609 (patch)
tree3368d2d4fa192b0274d9ed9dd9c84f07482710ab /drivers
parentd92ea21bafb674ee2bf27447970b047845e7b0a2 (diff)
Move conditional compilation of MPC8XXX SPI driver to Makefile
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/spi/Makefile2
-rw-r--r--drivers/spi/mpc8xxx_spi.c2
2 files changed, 1 insertions, 3 deletions
diff --git a/drivers/spi/Makefile b/drivers/spi/Makefile
index e66e0ee092..4f7b679eeb 100644
--- a/drivers/spi/Makefile
+++ b/drivers/spi/Makefile
@@ -25,7 +25,7 @@ include $(TOPDIR)/config.mk
LIB := $(obj)libspi.a
-COBJS-y += mpc8xxx_spi.o
+COBJS-$(CONFIG_MPC8XXX_SPI) += mpc8xxx_spi.o
COBJS-$(CONFIG_ATMEL_SPI) += atmel_spi.o
COBJS-$(CONFIG_MXC_SPI) += mxc_spi.o
diff --git a/drivers/spi/mpc8xxx_spi.c b/drivers/spi/mpc8xxx_spi.c
index 136fb50052..9eaf9860b4 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 */