git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into upstream.
[pandora-kernel.git]
/
arch
/
cris
/
arch-v32
/
drivers
/
Makefile
diff --git
a/arch/cris/arch-v32/drivers/Makefile
b/arch/cris/arch-v32/drivers/Makefile
index
a359cd2
..
39aa3c1
100644
(file)
--- a/
arch/cris/arch-v32/drivers/Makefile
+++ b/
arch/cris/arch-v32/drivers/Makefile
@@
-4,10
+4,10
@@
obj-$(CONFIG_ETRAX_STREAMCOPROC) += cryptocop.o
obj-$(CONFIG_ETRAX_AXISFLASHMAP) += axisflashmap.o
obj-$(CONFIG_ETRAX_STREAMCOPROC) += cryptocop.o
obj-$(CONFIG_ETRAX_AXISFLASHMAP) += axisflashmap.o
-obj-$(CONFIG_ETRAX
_NANDFLASH) += nandflash.o
-obj-$(CONFIG_
ETRAX_GPIO) += gpio.o
+obj-$(CONFIG_ETRAX
FS) += mach-fs/
+obj-$(CONFIG_
CRIS_MACH_ARTPEC3) += mach-a3/
obj-$(CONFIG_ETRAX_IOP_FW_LOAD) += iop_fw_load.o
obj-$(CONFIG_ETRAX_IOP_FW_LOAD) += iop_fw_load.o
-obj-$(CONFIG_ETRAX_PCF8563) += pcf8563.o
obj-$(CONFIG_ETRAX_I2C) += i2c.o
obj-$(CONFIG_ETRAX_SYNCHRONOUS_SERIAL) += sync_serial.o
obj-$(CONFIG_PCI) += pci/
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