diff options
| author | Pawit Pornkitprasan <p.pawit@gmail.com> | 2012-12-05 23:06:13 +0700 |
|---|---|---|
| committer | Pawit Pornkitprasan <p.pawit@gmail.com> | 2012-12-05 23:07:13 +0700 |
| commit | adbff11f9517c5296e452a1034d05864cf3dbfb3 (patch) | |
| tree | ebe89558e8db50e70c91f316c0f322216f307be7 /arch/mips/kernel | |
| parent | 15ced1fb4a207c2e99ea007ce447d9b5cd676435 (diff) | |
| parent | 7cd2d7c8aa6c52fbb7c846ab785ef752dd923116 (diff) | |
| download | kernel_samsung_aries-adbff11f9517c5296e452a1034d05864cf3dbfb3.zip kernel_samsung_aries-adbff11f9517c5296e452a1034d05864cf3dbfb3.tar.gz kernel_samsung_aries-adbff11f9517c5296e452a1034d05864cf3dbfb3.tar.bz2 | |
Merge 3.0.54
Change-Id: I68316b1f2af49f27e3462384592d3bba217302b6
Diffstat (limited to 'arch/mips/kernel')
| -rw-r--r-- | arch/mips/kernel/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/kernel/Makefile b/arch/mips/kernel/Makefile index 83bba33..8b3c62c 100644 --- a/arch/mips/kernel/Makefile +++ b/arch/mips/kernel/Makefile @@ -100,7 +100,7 @@ obj-$(CONFIG_MIPS_MACHINE) += mips_machine.o obj-$(CONFIG_OF) += prom.o -CFLAGS_cpu-bugs64.o = $(shell if $(CC) $(KBUILD_CFLAGS) -Wa,-mdaddi -c -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-DHAVE_AS_SET_DADDI"; fi) +CFLAGS_cpu-bugs64.o = $(shell if $(CC) $(KBUILD_CFLAGS) -Wa,-mdaddi -c -o /dev/null -x c /dev/null >/dev/null 2>&1; then echo "-DHAVE_AS_SET_DADDI"; fi) obj-$(CONFIG_HAVE_STD_PC_SERIAL_PORT) += 8250-platform.o |