diff options
author | John W. Linville <linville@tuxdriver.com> | 2010-08-16 18:40:44 (GMT) |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2010-08-16 18:40:44 (GMT) |
commit | 9714d315d28aef77a097fe905b25cc273c3d72ad (patch) | |
tree | 0ae1150b0723e925785ce774c3554f29fda050f6 /arch/arm/mm/Makefile | |
parent | 84c164a34ffe67908a932a2d641ec1a80c2d5435 (diff) | |
parent | 6ccf15a1a76d2ff915cdef6ae4d12d0170087118 (diff) | |
download | linux-fsl-qoriq-9714d315d28aef77a097fe905b25cc273c3d72ad.tar.xz |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'arch/arm/mm/Makefile')
-rw-r--r-- | arch/arm/mm/Makefile | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mm/Makefile b/arch/arm/mm/Makefile index e8d34a80..d63b6c4 100644 --- a/arch/arm/mm/Makefile +++ b/arch/arm/mm/Makefile @@ -15,7 +15,6 @@ endif obj-$(CONFIG_MODULES) += proc-syms.o obj-$(CONFIG_ALIGNMENT_TRAP) += alignment.o -obj-$(CONFIG_DISCONTIGMEM) += discontig.o obj-$(CONFIG_HIGHMEM) += highmem.o obj-$(CONFIG_CPU_ABRT_NOMMU) += abort-nommu.o |