diff options
author | Takashi Iwai <tiwai@suse.de> | 2009-11-16 11:33:41 +0100 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2009-11-16 11:33:41 +0100 |
commit | fe705ab1526bc2c8b7756f3a855f040ab2060af2 (patch) | |
tree | c4444d19983c5578f9ef2bddc1fa01b6e42f91a3 /arch/arm/mm/Makefile | |
parent | Merge branch 'fix/hda' into topic/hda (diff) | |
parent | ALSA: rename "PC Speaker" controls to "Speaker" (diff) | |
download | linux-fe705ab1526bc2c8b7756f3a855f040ab2060af2.tar.xz linux-fe705ab1526bc2c8b7756f3a855f040ab2060af2.zip |
Merge branch 'topic/beep-rename' into topic/hda
Diffstat (limited to 'arch/arm/mm/Makefile')
-rw-r--r-- | arch/arm/mm/Makefile | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/mm/Makefile b/arch/arm/mm/Makefile index 63e3f6dd0e21..055cb2aa8134 100644 --- a/arch/arm/mm/Makefile +++ b/arch/arm/mm/Makefile @@ -27,6 +27,10 @@ obj-$(CONFIG_CPU_ABRT_EV5TJ) += abort-ev5tj.o obj-$(CONFIG_CPU_ABRT_EV6) += abort-ev6.o obj-$(CONFIG_CPU_ABRT_EV7) += abort-ev7.o +obj-$(CONFIG_CPU_PABRT_LEGACY) += pabort-legacy.o +obj-$(CONFIG_CPU_PABRT_V6) += pabort-v6.o +obj-$(CONFIG_CPU_PABRT_V7) += pabort-v7.o + obj-$(CONFIG_CPU_CACHE_V3) += cache-v3.o obj-$(CONFIG_CPU_CACHE_V4) += cache-v4.o obj-$(CONFIG_CPU_CACHE_V4WT) += cache-v4wt.o |