projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'iwlwifi-next-for-kalle-2014-12-30' of https://git.kernel.org/pub/scm/linux...
[cascardo/linux.git]
/
arch
/
cris
/
arch-v32
/
drivers
/
Makefile
diff --git
a/arch/cris/arch-v32/drivers/Makefile
b/arch/cris/arch-v32/drivers/Makefile
index
39aa3c1
..
15fbfef
100644
(file)
--- a/
arch/cris/arch-v32/drivers/Makefile
+++ b/
arch/cris/arch-v32/drivers/Makefile
@@
-10,4
+10,3
@@
obj-$(CONFIG_ETRAX_IOP_FW_LOAD) += iop_fw_load.o
obj-$(CONFIG_ETRAX_I2C) += i2c.o
obj-$(CONFIG_ETRAX_SYNCHRONOUS_SERIAL) += sync_serial.o
obj-$(CONFIG_PCI) += pci/
-obj-$(CONFIG_ETRAX_SPI_MMC_BOARD) += board_mmcspi.o