diff options
| author | Benjamin Herrenschmidt | 2011-11-25 05:25:39 +0100 |
|---|---|---|
| committer | Benjamin Herrenschmidt | 2011-11-25 05:25:39 +0100 |
| commit | 56368797d6c2d093bb0e7a7e5fe7b267274b6c58 (patch) | |
| tree | fc74d34be3628d31e50d3987dd372b73dd50c352 /arch/powerpc/sysdev/Makefile | |
| parent | powerpc/mpic: Remove extra semicolon. (diff) | |
| parent | drivers/serial/ucc_uart.c: Add missing call to init UCC UART port timeout (diff) | |
| download | kernel-qcow2-linux-56368797d6c2d093bb0e7a7e5fe7b267274b6c58.tar.gz kernel-qcow2-linux-56368797d6c2d093bb0e7a7e5fe7b267274b6c58.tar.xz kernel-qcow2-linux-56368797d6c2d093bb0e7a7e5fe7b267274b6c58.zip | |
Merge remote-tracking branch 'kumar/next' into next
Diffstat (limited to 'arch/powerpc/sysdev/Makefile')
| -rw-r--r-- | arch/powerpc/sysdev/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/sysdev/Makefile b/arch/powerpc/sysdev/Makefile index 84e13253aec5..8dea5935b21f 100644 --- a/arch/powerpc/sysdev/Makefile +++ b/arch/powerpc/sysdev/Makefile @@ -20,7 +20,7 @@ obj-$(CONFIG_FSL_LBC) += fsl_lbc.o obj-$(CONFIG_FSL_GTM) += fsl_gtm.o obj-$(CONFIG_FSL_85XX_CACHE_SRAM) += fsl_85xx_l2ctlr.o fsl_85xx_cache_sram.o obj-$(CONFIG_SIMPLE_GPIO) += simple_gpio.o -obj-$(CONFIG_FSL_RIO) += fsl_rio.o +obj-$(CONFIG_FSL_RIO) += fsl_rio.o fsl_rmu.o obj-$(CONFIG_TSI108_BRIDGE) += tsi108_pci.o tsi108_dev.o obj-$(CONFIG_QUICC_ENGINE) += qe_lib/ obj-$(CONFIG_PPC_BESTCOMM) += bestcomm/ |