diff options
| author | Eric Miao <eric.miao@linaro.org> | 2012-01-17 21:11:54 +0800 |
|---|---|---|
| committer | Eric Miao <eric.miao@linaro.org> | 2012-01-17 21:11:54 +0800 |
| commit | c493c61a212aa7599d619ae9d19b9f6af73ff663 (patch) | |
| tree | 6739705276cde364703736ac78f21c0c6af679f2 /drivers/spi/Makefile | |
| parent | 5878df1b7162cea6b65436b5dedb5f37fc1cc8f3 (diff) | |
| parent | dda3e196c5317dfeddd4cc089512c2327b05ff23 (diff) | |
Merge branch 'dirkbehme/master_imx6' into lt-imx6lt-imx6
* dirkbehme/master_imx6: (22 commits)
imximage: Sort bootops alphabetically
imximage: Add support for i.MX6
imximage: Add MX53 to the documentation
common/image.c: align usage of fdt_high with initrd_high
mx6q: Add fdt_high and initrd_high variables
mx6x_pins: fix uart txd definitions
mx6qsabrelite: setup uart1 pinmux
mx6qsabrelite: add SPI NOR support
mx6q: add ECSPI pad settings
add imx_ecspi driver
fec_mxc: move autonegoatiate restart after mii_postcall
fsl_esdhc: fix PIO mode transfers
mx6qsabrelite: enet: force master, maximize tx clock delay
mx6qsabrelite: add CONFIG_PHY_MICREL_KSZ9021
miiphyutil: add Micrel KSZ9021 support to miiphy_speed
fec_mxc: increase autonegotiation timeout
fec_mxc: add 1000 Mbps selection
mx6qsabrelite: use IMX_GPIO_NR macro
i.mx6:imx6q: allign MAC address with burned-in ordering
i.mx6q: mx6qarm2: Enable the usboh3 clock
...
Diffstat (limited to 'drivers/spi/Makefile')
| -rw-r--r-- | drivers/spi/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/spi/Makefile b/drivers/spi/Makefile index 6f389f093..b2c310b31 100644 --- a/drivers/spi/Makefile +++ b/drivers/spi/Makefile @@ -33,6 +33,7 @@ COBJS-$(CONFIG_ATMEL_SPI) += atmel_spi.o COBJS-$(CONFIG_BFIN_SPI) += bfin_spi.o COBJS-$(CONFIG_CF_SPI) += cf_spi.o COBJS-$(CONFIG_DAVINCI_SPI) += davinci_spi.o +COBJS-$(CONFIG_IMX_ECSPI) += imx_ecspi.o COBJS-$(CONFIG_KIRKWOOD_SPI) += kirkwood_spi.o COBJS-$(CONFIG_MPC52XX_SPI) += mpc52xx_spi.o COBJS-$(CONFIG_MPC8XXX_SPI) += mpc8xxx_spi.o |