diff options
| author | Russell King | 2009-12-05 11:35:33 +0100 |
|---|---|---|
| committer | Russell King | 2009-12-05 11:35:33 +0100 |
| commit | 0719dc341389882cc834ed18fc9b7fc6006b2b85 (patch) | |
| tree | 794480ac62c07ea8cc4e69c2cb3d2b83bb7f36b7 /arch/arm/mm/Makefile | |
| parent | Merge branches 'at91', 'ep93xx', 'etm', 'ks8695', 'nuc', 'u300' and 'u8500' i... (diff) | |
| parent | Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into dev... (diff) | |
| download | kernel-qcow2-linux-0719dc341389882cc834ed18fc9b7fc6006b2b85.tar.gz kernel-qcow2-linux-0719dc341389882cc834ed18fc9b7fc6006b2b85.tar.xz kernel-qcow2-linux-0719dc341389882cc834ed18fc9b7fc6006b2b85.zip | |
Merge branch 'devel-stable' into devel
Diffstat (limited to 'arch/arm/mm/Makefile')
| -rw-r--r-- | arch/arm/mm/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mm/Makefile b/arch/arm/mm/Makefile index 42352e75742b..827e238e5d4a 100644 --- a/arch/arm/mm/Makefile +++ b/arch/arm/mm/Makefile @@ -87,4 +87,4 @@ obj-$(CONFIG_CPU_V7) += proc-v7.o obj-$(CONFIG_CACHE_FEROCEON_L2) += cache-feroceon-l2.o obj-$(CONFIG_CACHE_L2X0) += cache-l2x0.o obj-$(CONFIG_CACHE_XSC3L2) += cache-xsc3l2.o - +obj-$(CONFIG_CACHE_TAUROS2) += cache-tauros2.o |