From patchwork Sat Nov 6 21:30:25 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnaud Lacombe X-Patchwork-Id: 306452 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id oA6LXl8n014943 for ; Sat, 6 Nov 2010 21:33:47 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753806Ab0KFVdp (ORCPT ); Sat, 6 Nov 2010 17:33:45 -0400 Received: from mail-yw0-f46.google.com ([209.85.213.46]:44901 "EHLO mail-yw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753776Ab0KFVdn (ORCPT ); Sat, 6 Nov 2010 17:33:43 -0400 Received: by mail-yw0-f46.google.com with SMTP id 21so2768458ywc.19 for ; Sat, 06 Nov 2010 14:33:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:subject:date :message-id:x-mailer:in-reply-to:references; bh=li5qRcDazDz210RUurL2ovqYKuNsxz814+3TcZO/P7I=; b=tOlyuSl3DvtUM7WnLjnbPFC/xgnyHmaDDoGrmqbvOcCZRhHyY7xmsEAv7IJq95qemt Y8nP98MJnoktmF+7Qzra93qSDvlygGzFKbiGG3VlcAKdmW94VPj7Im3qOE3jG10e88pf DLCGUamsaDQD2CkpBysdr/P78/x89OdY4SIzA= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; b=UrJDwjkWxf9ahJNR7ozAzTDPluKYchQ22AEchojL9J3pT9mQ9I0BsFZRwZnhW2x28Y Egf4wLJFv9W/XfD01OzL9PSpw1J0I/gFDzZvYKU7wVfkZ4RqLTp9E4oT2oYUrV7P6LJ8 etqUPSK5g96AhL1N5ORkKKBd/jnx0TdAPjNPE= Received: by 10.151.154.3 with SMTP id g3mr5898298ybo.221.1289079223381; Sat, 06 Nov 2010 14:33:43 -0700 (PDT) Received: from localhost.localdomain (76-10-183-171.dsl.teksavvy.com [76.10.183.171]) by mx.google.com with ESMTPS id l66sm2200877yhd.20.2010.11.06.14.33.40 (version=SSLv3 cipher=RC4-MD5); Sat, 06 Nov 2010 14:33:42 -0700 (PDT) From: Arnaud Lacombe To: linux-kbuild@vger.kernel.org, linux-media@vger.kernel.org Cc: Mauro Carvalho Chehab , Michal Marek , Arnaud Lacombe Subject: [PATCH 3/5] Revert "i2c: Fix Kconfig dependencies" Date: Sat, 6 Nov 2010 17:30:25 -0400 Message-Id: <1289079027-3037-4-git-send-email-lacombar@gmail.com> X-Mailer: git-send-email 1.7.2.30.gc37d7.dirty In-Reply-To: <4CD300AC.3010708@redhat.com> References: <4CD300AC.3010708@redhat.com> Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Sat, 06 Nov 2010 21:33:47 +0000 (UTC) diff --git a/drivers/i2c/Kconfig b/drivers/i2c/Kconfig index b923074..30f06e9 100644 --- a/drivers/i2c/Kconfig +++ b/drivers/i2c/Kconfig @@ -75,8 +75,7 @@ config I2C_HELPER_AUTO In doubt, say Y. config I2C_SMBUS - tristate - prompt "SMBus-specific protocols" if !I2C_HELPER_AUTO + tristate "SMBus-specific protocols" if !I2C_HELPER_AUTO help Say Y here if you want support for SMBus extensions to the I2C specification. At the moment, the only supported extension is diff --git a/drivers/i2c/algos/Kconfig b/drivers/i2c/algos/Kconfig index 3998dd6..7b2ce4a 100644 --- a/drivers/i2c/algos/Kconfig +++ b/drivers/i2c/algos/Kconfig @@ -15,15 +15,3 @@ config I2C_ALGOPCA tristate "I2C PCA 9564 interfaces" endmenu - -# In automatic configuration mode, we still have to define the -# symbols to avoid unmet dependencies. - -if I2C_HELPER_AUTO -config I2C_ALGOBIT - tristate -config I2C_ALGOPCF - tristate -config I2C_ALGOPCA - tristate -endif