Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754134AbZDZJS0 (ORCPT ); Sun, 26 Apr 2009 05:18:26 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752399AbZDZJSP (ORCPT ); Sun, 26 Apr 2009 05:18:15 -0400 Received: from cathcart.site5.com ([74.54.107.137]:46399 "EHLO cathcart.site5.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751850AbZDZJSO (ORCPT ); Sun, 26 Apr 2009 05:18:14 -0400 From: Mike Rapoport To: broonie@opensource.wolfsonmicro.com Cc: lrg@slimlogic.co.uk, linux-kernel@vger.kernel.org, Mike Rapoport Subject: [PATCH 1/2] regulator: move regulator_consumer_supply from machine.h to consumer.h Date: Sun, 26 Apr 2009 12:17:22 +0300 Message-Id: X-Mailer: git-send-email 1.5.6.4 In-Reply-To: References: X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - cathcart.site5.com X-AntiAbuse: Original Domain - vger.kernel.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - compulab.co.il X-Source: X-Source-Args: X-Source-Dir: Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2084 Lines: 70 Signed-off-by: Mike Rapoport --- include/linux/regulator/consumer.h | 13 +++++++++++++ include/linux/regulator/machine.h | 14 +------------- 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/include/linux/regulator/consumer.h b/include/linux/regulator/consumer.h index 277f4b9..3c7acb7 100644 --- a/include/linux/regulator/consumer.h +++ b/include/linux/regulator/consumer.h @@ -120,6 +120,19 @@ struct regulator_bulk_data { struct regulator *consumer; }; +/** + * struct regulator_consumer_supply - supply -> device mapping + * + * This maps a supply name to a device. + * + * @dev: Device structure for the consumer. + * @supply: Name for the supply. + */ +struct regulator_consumer_supply { + struct device *dev; /* consumer */ + const char *supply; /* consumer supply - e.g. "vcc" */ +}; + #if defined(CONFIG_REGULATOR) /* regulator get and put */ diff --git a/include/linux/regulator/machine.h b/include/linux/regulator/machine.h index bac64fa..c64c833 100644 --- a/include/linux/regulator/machine.h +++ b/include/linux/regulator/machine.h @@ -19,6 +19,7 @@ #include struct regulator; +struct regulator_consumer_supply; /* * Regulator operation constraint flags. These flags are used to enable @@ -124,19 +125,6 @@ struct regulation_constraints { }; /** - * struct regulator_consumer_supply - supply -> device mapping - * - * This maps a supply name to a device. - * - * @dev: Device structure for the consumer. - * @supply: Name for the supply. - */ -struct regulator_consumer_supply { - struct device *dev; /* consumer */ - const char *supply; /* consumer supply - e.g. "vcc" */ -}; - -/** * struct regulator_init_data - regulator platform initialisation data. * * Initialisation constraints, our supply and consumers supplies. -- 1.5.6.4 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/