From patchwork Tue Mar 18 21:10:24 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Scott Wood X-Patchwork-Id: 331538 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from ozlabs.org (localhost [IPv6:::1]) by ozlabs.org (Postfix) with ESMTP id 1695A2C020F for ; Wed, 19 Mar 2014 08:11:12 +1100 (EST) Received: from na01-bn1-obe.outbound.protection.outlook.com (mail-bn1lp0139.outbound.protection.outlook.com [207.46.163.139]) (using TLSv1 with cipher AES128-SHA (128/128 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 5553C2C00A0 for ; Wed, 19 Mar 2014 08:10:43 +1100 (EST) Received: from snotra.am.freescale.net (192.88.168.49) by DM2PR03MB398.namprd03.prod.outlook.com (10.141.84.140) with Microsoft SMTP Server (TLS) id 15.0.898.11; Tue, 18 Mar 2014 21:10:36 +0000 From: Scott Wood To: Jochen Friedrich , Wolfram Sang Subject: [PATCH] i2c-cpm: Fix build by adding of_address.h and of_irq.h Date: Tue, 18 Mar 2014 16:10:24 -0500 Message-ID: <1395177024-5178-1-git-send-email-scottwood@freescale.com> X-Mailer: git-send-email 1.8.3.2 MIME-Version: 1.0 X-Originating-IP: [192.88.168.49] X-ClientProxiedBy: BY2PR05CA017.namprd05.prod.outlook.com (10.141.216.27) To DM2PR03MB398.namprd03.prod.outlook.com (10.141.84.140) X-Forefront-PRVS: 0154C61618 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009001)(6009001)(428001)(199002)(189002)(47776003)(59766001)(20776003)(94316002)(66066001)(87286001)(79102001)(87976001)(94946001)(63696002)(77982001)(76796001)(76176001)(93516002)(4396001)(83072002)(76786001)(77096001)(77156001)(74706001)(50986001)(95416001)(47976001)(74876001)(575784001)(50226001)(92566001)(49866001)(93916002)(87266001)(50466002)(89996001)(85852003)(81816001)(83322001)(56776001)(85306002)(97336001)(51856001)(48376002)(97186001)(74662001)(36756003)(92726001)(81342001)(56816005)(42186004)(74502001)(62966002)(74366001)(81686001)(47446002)(81542001)(53806001)(69226001)(95666003)(76482001)(80976001)(19580395003)(19580405001)(46102001)(54316002)(90146001)(88136002)(31966008)(33646001)(86362001)(47736001)(65816001)(93136001)(80022001); DIR:OUT; SFP:1101; SCL:1; SRVR:DM2PR03MB398; H:snotra.am.freescale.net; FPR:EFC1D0C9.31C8D9D.2FD5FF3.98D63302.2025D; MLV:sfv; PTR:InfoNoRecords; A:1; MX:1; LANG:en; Received-SPF: None (: freescale.com does not designate permitted sender hosts) X-OriginatorOrg: freescale.com Cc: Richard Weinberger , Geert Uytterhoeven , linux-i2c@vger.kernel.org, Scott Wood , linuxppc-dev@lists.ozlabs.org, stable@kernel.org X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" Fixes a build break due to the undeclared use of irq_of_parse_and_map() and of_iomap(). This build break was apparently introduced while the driver was unbuildable due to the bug fixed by 62c19c9d29e65086e5ae76df371ed2e6b23f00cd ("i2c: Remove usage of orphaned symbol OF_I2C"). When 62c19c was added in v3.14-rc7, the driver was enabled again, breaking the powerpc mpc85xx_defconfig and mpc85xx_smp_defconfig. 62c19c is marked for stable, so this should go there as well. Signed-off-by: Scott Wood Reported-by: Geert Uytterhoeven Cc: Richard Weinberger Cc: stable@kernel.org --- There are still warnings in this driver that suggest it is broken with CONFIG_PHYS_64BIT, but that part does not appear to be a regression. drivers/i2c/busses/i2c-cpm.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/i2c/busses/i2c-cpm.c b/drivers/i2c/busses/i2c-cpm.c index be7f0a2..f3b89a4 100644 --- a/drivers/i2c/busses/i2c-cpm.c +++ b/drivers/i2c/busses/i2c-cpm.c @@ -39,7 +39,9 @@ #include #include #include +#include #include +#include #include #include #include