diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-08-08 14:56:19 +0900 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-08-08 14:56:19 +0900 |
| commit | 18d4ed4342c14ebeebe60d267b171053efcdfa87 (patch) | |
| tree | f315e77f66cbb70869e2f80cde5c18380a80901e /arch/openrisc/mm/Makefile | |
| parent | 722d0daf2b607a32dad1357bf797e3803484af0a (diff) | |
| parent | 22de4534ae12d61257fc0e53d2571686b03305bc (diff) | |
| download | linux-18d4ed4342c14ebeebe60d267b171053efcdfa87.tar.bz2 | |
Merge branch 'for-3.1' into for-3.2
Conflict due to the fix for the register map failure - taken the for-3.1
version.
Conflicts:
sound/soc/codecs/sgtl5000.c
Diffstat (limited to 'arch/openrisc/mm/Makefile')
| -rw-r--r-- | arch/openrisc/mm/Makefile | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/openrisc/mm/Makefile b/arch/openrisc/mm/Makefile new file mode 100644 index 000000000000..324ba2634529 --- /dev/null +++ b/arch/openrisc/mm/Makefile @@ -0,0 +1,5 @@ +# +# Makefile for the linux openrisc-specific parts of the memory manager. +# + +obj-y := fault.o tlb.o init.o ioremap.o |