[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <d8276bd68d4bd06f1566e832b84c02528332048c.1240736991.git.mike@compulab.co.il>
Date: Sun, 26 Apr 2009 12:17:22 +0300
From: Mike Rapoport <mike@...pulab.co.il>
To: broonie@...nsource.wolfsonmicro.com
Cc: lrg@...mlogic.co.uk, linux-kernel@...r.kernel.org,
Mike Rapoport <mike@...pulab.co.il>
Subject: [PATCH 1/2] regulator: move regulator_consumer_supply from machine.h to consumer.h
Signed-off-by: Mike Rapoport <mike@...pulab.co.il>
---
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 <linux/suspend.h>
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@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists