diff options
author | Linus Torvalds | 2009-03-14 12:02:21 -0700 |
---|---|---|
committer | Linus Torvalds | 2009-03-14 12:02:21 -0700 |
commit | 326d8519fc97be186c55ac605c3a7c957c758ae1 (patch) | |
tree | c2a25f2ce5ea7095715a62bad984ecd95fb0b717 /arch/mips/Makefile | |
parent | 228b5b7e840f79c8751614ae2b83e97e361634ce (diff) | |
parent | a83860c2da9303c864a53c299d17f608f9643541 (diff) |
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
MIPS: Mark Eins: Fix configuration.
MIPS: Fix TIF_32BIT undefined problem when seccomp is disabled
Diffstat (limited to 'arch/mips/Makefile')
-rw-r--r-- | arch/mips/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/Makefile b/arch/mips/Makefile index 21b00e95daef..22dab2e14348 100644 --- a/arch/mips/Makefile +++ b/arch/mips/Makefile @@ -416,7 +416,7 @@ load-$(CONFIG_PNX8550_STB810) += 0xffffffff80060000 # # Common NEC EMMAXXX # -core-$(CONFIG_SOC_EMMA) += arch/mips/emma/common/ +core-$(CONFIG_SOC_EMMA2RH) += arch/mips/emma/common/ cflags-$(CONFIG_SOC_EMMA2RH) += -I$(srctree)/arch/mips/include/asm/mach-emma2rh # |