diff options
author | Russell King <rmk+kernel@armlinux.org.uk> | 2019-07-03 13:44:46 +0300 |
---|---|---|
committer | Russell King <rmk+kernel@armlinux.org.uk> | 2019-07-03 13:44:46 +0300 |
commit | 1f6db18fbd764ea3079eba289652b622f9c8c5ef (patch) | |
tree | 7483de89a7684b33634190220c15abc3dcf42039 /arch/arm/mach-rpc/Makefile | |
parent | d6c8204659eb1846c444997ee28fe9d7e5442f4e (diff) | |
parent | 0b40deeef6d94ac21f4cdee4b1cda94a69c54ff9 (diff) | |
download | linux-1f6db18fbd764ea3079eba289652b622f9c8c5ef.tar.xz |
Merge branch 'sa1100-for-next'; commit 'riscpc^{/ARM: riscpc: enable chained scatterlist support}' into for-arm-soc
Diffstat (limited to 'arch/arm/mach-rpc/Makefile')
-rw-r--r-- | arch/arm/mach-rpc/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-rpc/Makefile b/arch/arm/mach-rpc/Makefile index 056ef5460290..90a645a18444 100644 --- a/arch/arm/mach-rpc/Makefile +++ b/arch/arm/mach-rpc/Makefile @@ -5,4 +5,5 @@ # Object file lists. -obj-y := dma.o ecard.o fiq.o irq.o riscpc.o time.o +obj-y :=dma.o ecard.o ecard-loader.o fiq.o floppydma.o io-acorn.o irq.o \ + riscpc.o time.o |