diff options
| author | Takashi Iwai <tiwai@suse.de> | 2014-05-27 11:38:08 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2014-05-27 11:38:08 -0400 |
| commit | a58bdba749b36069ec372da9c9fd16017b6c0b47 (patch) | |
| tree | 95c79448427425d1c05712a7c7fb98ed42e41539 /arch/mips/dec/prom/Makefile | |
| parent | 00a6d7b6762c27d441e9ac8faff36384bc0fc180 (diff) | |
| parent | 51fa31d462f32e1ffdf957802dcab1dc20d2f243 (diff) | |
Merge branch 'topic/firewire' into for-next
This is a merge of big firewire audio stack updates by Takashi Sakamoto.
Diffstat (limited to 'arch/mips/dec/prom/Makefile')
| -rw-r--r-- | arch/mips/dec/prom/Makefile | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/mips/dec/prom/Makefile b/arch/mips/dec/prom/Makefile index 064ae7a76bdc..ae73e42ac20b 100644 --- a/arch/mips/dec/prom/Makefile +++ b/arch/mips/dec/prom/Makefile | |||
| @@ -6,4 +6,3 @@ | |||
| 6 | lib-y += init.o memory.o cmdline.o identify.o console.o | 6 | lib-y += init.o memory.o cmdline.o identify.o console.o |
| 7 | 7 | ||
| 8 | lib-$(CONFIG_32BIT) += locore.o | 8 | lib-$(CONFIG_32BIT) += locore.o |
| 9 | lib-$(CONFIG_64BIT) += call_o32.o | ||