From patchwork Fri Dec 13 20:15:52 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomasz Figa X-Patchwork-Id: 3342531 Return-Path: X-Original-To: patchwork-linux-samsung-soc@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id E41D4C0D4A for ; Fri, 13 Dec 2013 20:16:10 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 2FD99204A2 for ; Fri, 13 Dec 2013 20:16:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1A0C520328 for ; Fri, 13 Dec 2013 20:16:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752172Ab3LMUQI (ORCPT ); Fri, 13 Dec 2013 15:16:08 -0500 Received: from mail-ea0-f182.google.com ([209.85.215.182]:60342 "EHLO mail-ea0-f182.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752125Ab3LMUQH (ORCPT ); Fri, 13 Dec 2013 15:16:07 -0500 Received: by mail-ea0-f182.google.com with SMTP id a15so1092156eae.27 for ; Fri, 13 Dec 2013 12:16:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=v7RHuJdn8wyThujUx08pZrv9fC3zjMkotK7SK5RH0BA=; b=W+WcwUTFmPBx0+/hmq8BIvGWyyMdbej6joy0EoBub9KRLuzos3rVFDkKGJPqPcs5Ag /y9pY6yAlVKbOTNqJRx/MG+2DcUZHYxBek2Kpxl1bezSUTjewoXhD9u9ttr8bjQWfF2C jboL9zTuML4LKwkdWqXbrVHFJHTirrTFYJCbDUHn6yKygpW+nFzK7XtXvW4oUeS7GnOf UoKn01OvaONI0zyBWGognaHECFMJP3YqFzsfEL7ASeqOjzcrpCfqzbH624A5WovufT8y FDdU7jSXH0opWxPiKSV/1E9EeEk/8qQS/aNI4zhfSZrFbf+6VuViYpb0x8lTsAsnjYN3 6Fdw== X-Received: by 10.14.119.1 with SMTP id m1mr4700918eeh.39.1386965765913; Fri, 13 Dec 2013 12:16:05 -0800 (PST) Received: from flatron.tomeq (87-207-52-162.dynamic.chello.pl. [87.207.52.162]) by mx.google.com with ESMTPSA id e3sm10461059eeg.11.2013.12.13.12.16.04 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 13 Dec 2013 12:16:05 -0800 (PST) From: Tomasz Figa To: linux-samsung-soc@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org, Kukjin Kim , Arnd Bergmann , Olof Johansson , Russell King - ARM Linux , Tomasz Figa Subject: [PATCH] ARM: s3c64xx: Do not select both CPU_V6 and CPU_V6K at the same time Date: Fri, 13 Dec 2013 21:15:52 +0100 Message-Id: <1386965752-15954-1-git-send-email-tomasz.figa@gmail.com> X-Mailer: git-send-email 1.8.5.1 Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP To use V6K extensions, these symbols must not be selected at the same time, so this patch keeps only CPU_V6K selected for S3C64XX. Signed-off-by: Tomasz Figa --- arch/arm/Kconfig | 1 - 1 file changed, 1 deletion(-) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index b64a8ef..4df191b 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -731,7 +731,6 @@ config ARCH_S3C64XX select CLKDEV_LOOKUP select CLKSRC_SAMSUNG_PWM select COMMON_CLK - select CPU_V6 select CPU_V6K select GENERIC_CLOCKEVENTS select GPIO_SAMSUNG