commit 20582daf5273df992c2d37fcf2d5092e27c2aedd
author Ben Warren <biggerbadderben@gmail.com> Sun Jun 08 23:28:33 2008 -0700
committer Wolfgang Denk <wd@denx.de> Tue Jul 01 21:02:11 2008 +0200
tree 3368d2d4fa192b0274d9ed9dd9c84f07482710ab
parent ca9d9c21af3075f421c0f37a2c65550870cfe52a

Move conditional compilation of MPC8XXX SPI driver to Makefile

Signed-off-by: Ben Warren <biggerbadderben@gmail.com>

drivers/spi/Makefile

diff --git a/drivers/spi/Makefile b/drivers/spi/Makefile
index e66e0ee..4f7b679 100644
--- a/drivers/spi/Makefile
+++ b/drivers/spi/Makefile
@@ -25,7 +25,7 @@
 
 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
 

drivers/spi/mpc8xxx_spi.c

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 @@
 
 	return 0;
 }
-#endif				/* CONFIG_HARD_SPI */