renamed:drivers/regulator/rk2818_lp8725.h -> include/linux/regulator/rk2818_lp8725.h

diff --git a/arch/arm/mach-rk2818/board-raho.c b/arch/arm/mach-rk2818/board-raho.c
index 460cabd2dc6b0d149f0dfeb9ec21ca7411e20cf8..a360dcb19da9ed92baa5fd51c1dd8e4f41513b2d 100755 (executable)
--- a/arch/arm/mach-rk2818/board-raho.c
+++ b/arch/arm/mach-rk2818/board-raho.c
@@ -49,7 +49,7 @@
 #include "devices.h"
 
 #include "../../../drivers/spi/rk2818_spim.h"
-#include "../../../drivers/regulator/rk2818_lp8725.h"
+#include <linux/regulator/rk2818_lp8725.h>
 /* --------------------------------------------------------------------
  *  ÉùÃ÷ÁËrk2818_gpioBankÊý×飬²¢¶¨ÒåÁËGPIO¼Ä´æÆ÷×éIDºÍ¼Ä´æÆ÷»ùµØÖ·¡£
  * -------------------------------------------------------------------- */

diff --git a/drivers/regulator/rk2818_lp8725.c b/drivers/regulator/rk2818_lp8725.c
index a4c59502cc4fee9c445db9a06827884297b15809..2aecf43f20a00438c31b17a1c2ef7d69baeb1df8 100644 (file)
--- a/drivers/regulator/rk2818_lp8725.c
+++ b/drivers/regulator/rk2818_lp8725.c
@@ -30,7 +30,7 @@ REVISION 0.01
 #include <linux/i2c.h>
 #include <linux/kernel.h>
 #include <linux/regulator/driver.h>
-#include "rk2818_lp8725.h"
+#include <linux/regulator/rk2818_lp8725.h>
 
 
 #if 0

diff --git a/drivers/regulator/rk2818_lp8725.h b/drivers/regulator/rk2818_lp8725.h
deleted file mode 100644 (file)
index 74caf43..0000000
--- a/drivers/regulator/rk2818_lp8725.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/* include/linux/regulator/rk2818_lp8725.h
- *
- * Copyright (C) 2010 ROCKCHIP, Inc.
- *
- * This software is licensed under the terms of the GNU General Public
- * License version 2, as published by the Free Software Foundation, and
- * may be copied, distributed, and modified under those terms.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- */
-#ifndef __LINUX_REGULATOR_LP8725_H
-#define __LINUX_REGULATOR_LP8725_H
-
-#include <linux/regulator/machine.h>
-
-#define LP8725_LDO1  0
-#define LP8725_LDO2  1
-#define LP8725_LDO3  2
-#define LP8725_LDO4  3
-#define LP8725_LDO5  4
-
-#define LP8725_LILO1 5
-#define LP8725_LILO2 6
-
-#define LP8725_DCDC1 7
-#define LP8725_DCDC2 8
-
-#define LP8725_NUM_REGULATORS 9
-
-struct lp8725_regulator_subdev {
-       int id;
-       struct regulator_init_data *initdata;
-};
-
-struct lp8725_platform_data {
-       int num_regulators;
-       struct lp8725_regulator_subdev *regulators;
-};
-
-#endif

diff --git a/include/linux/regulator/rk2818_lp8725.h b/include/linux/regulator/rk2818_lp8725.h
new file mode 100644 (file)
index 0000000..74caf43
--- /dev/null
+++ b/include/linux/regulator/rk2818_lp8725.h
@@ -0,0 +1,44 @@
+/* include/linux/regulator/rk2818_lp8725.h
+ *
+ * Copyright (C) 2010 ROCKCHIP, Inc.
+ *
+ * This software is licensed under the terms of the GNU General Public
+ * License version 2, as published by the Free Software Foundation, and
+ * may be copied, distributed, and modified under those terms.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ */
+#ifndef __LINUX_REGULATOR_LP8725_H
+#define __LINUX_REGULATOR_LP8725_H
+
+#include <linux/regulator/machine.h>
+
+#define LP8725_LDO1  0
+#define LP8725_LDO2  1
+#define LP8725_LDO3  2
+#define LP8725_LDO4  3
+#define LP8725_LDO5  4
+
+#define LP8725_LILO1 5
+#define LP8725_LILO2 6
+
+#define LP8725_DCDC1 7
+#define LP8725_DCDC2 8
+
+#define LP8725_NUM_REGULATORS 9
+
+struct lp8725_regulator_subdev {
+       int id;
+       struct regulator_init_data *initdata;
+};
+
+struct lp8725_platform_data {
+       int num_regulators;
+       struct lp8725_regulator_subdev *regulators;
+};
+
+#endif