[U-Boot-Users] [PATCH] Move conditional compilation of MPC8XXX SPI driver to Makefile

[Ben Warren]

Signed-off-by: Ben Warren <biggerbadderben at gmail.com>
---
 drivers/spi/Makefile      |    2 +-
 drivers/spi/mpc8xxx_spi.c |    2 --
 2 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/drivers/spi/Makefile b/drivers/spi/Makefile
index bc8a104..eab9d93 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_MXC_SPI) += mxc_spi.o
 
 COBJS	:= $(COBJS-y)
diff --git a/drivers/spi/mpc8xxx_spi.c b/drivers/spi/mpc8xxx_spi.c
index 2fe838c..5e2f67a 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 <spi.h>
 #include <asm/mpc8xxx_spi.h>
@@ -140,4 +139,3 @@ int spi_xfer(spi_chipsel_type chipsel, int bitlen, uchar *dout, uchar *din)
 
 	return 0;
 }
-#endif				/* CONFIG_HARD_SPI */
-- 
1.5.4.3