diff --git a/[refs] b/[refs] index a86e90e16974..795dde6cfa8f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 82a8508406906a39ed04cb59d83b1703d78dc8b3 +refs/heads/master: 894a65c857b2e595da1c65d1ad1a7c559ac88c8d diff --git a/trunk/arch/powerpc/Makefile b/trunk/arch/powerpc/Makefile index 68455ddb63b7..6ee3beb4d264 100644 --- a/trunk/arch/powerpc/Makefile +++ b/trunk/arch/powerpc/Makefile @@ -77,18 +77,8 @@ CPP = $(CC) -E $(KBUILD_CFLAGS) CHECKFLAGS += -m$(CONFIG_WORD_SIZE) -D__powerpc__ -D__powerpc$(CONFIG_WORD_SIZE)__ ifeq ($(CONFIG_PPC64),y) -GCC_BROKEN_VEC := $(call cc-ifversion, -lt, 0400, y) - ifeq ($(CONFIG_POWER4_ONLY),y) -ifeq ($(CONFIG_ALTIVEC),y) -ifeq ($(GCC_BROKEN_VEC),y) - KBUILD_CFLAGS += $(call cc-option,-mcpu=970) -else - KBUILD_CFLAGS += $(call cc-option,-mcpu=power4) -endif -else KBUILD_CFLAGS += $(call cc-option,-mcpu=power4) -endif else KBUILD_CFLAGS += $(call cc-option,-mtune=power4) endif