ARM: Add maru power supply virtual device

Conflicts:

	arch/arm/configs/tizen_defconfig
	drivers/maru/Kconfig
	drivers/maru/Makefile

diff --git a/arch/arm/configs/tizen_defconfig b/arch/arm/configs/tizen_defconfig
index f777de487eaed6d2fa65c5b43ff4cbf045e9327c..4c9229956b0c8951bde60f35f9f05b0d5279fe23 100644 (file)
--- a/arch/arm/configs/tizen_defconfig
+++ b/arch/arm/configs/tizen_defconfig
@@ -1525,6 +1525,7 @@ CONFIG_ANDROID_TIMED_OUTPUT=y
 # CONFIG_ANDROID_LOW_MEMORY_KILLER is not set
 # CONFIG_ANDROID_SWITCH is not set
 # CONFIG_PHONE is not set
+CONFIG_MARU_POWER_SUPPLY=y
 CONFIG_CLKDEV_LOOKUP=y
 
 #

diff --git a/drivers/maru/Kconfig b/drivers/maru/Kconfig
index 78e48f432dcce08b35c5b0fa158214600822d3f7..27678a322efd34e5ee01694335743f3be50620ce 100644 (file)
--- a/drivers/maru/Kconfig
+++ b/drivers/maru/Kconfig
@@ -51,3 +51,8 @@ config MARU_USB_MASS_STORAGE
 config MARU_USB_MODE
        tristate "MARU Usb mode Driver"
        depends on MARU != n
+
+config MARU_POWER_SUPPLY
+    tristate "MARU Power supply Driver"
+    depends on MARU != n
+

diff --git a/drivers/maru/Makefile b/drivers/maru/Makefile
index 3b4c39beb183c6dfa38430cadc03d96659f28799..fbdaa150113f23b7ef9b955714c4ab473528b4ab 100644 (file)
--- a/drivers/maru/Makefile
+++ b/drivers/maru/Makefile
@@ -1,6 +1,7 @@
 obj-$(CONFIG_MARU_LCD) += maru_lcd.o
 obj-$(CONFIG_MARU_CODEC) += maru_codec.o
 obj-$(CONFIG_MARU_TOUCHSCREEN) += maru_touchscreen.o
+obj-$(CONFIG_MARU_POWER_SUPPLY) += maru_power_supply.o
 obj-$(CONFIG_MARU_FB) += maru_fb.o
 obj-$(CONFIG_MARU_CAMERA) += maru_camera.o
 obj-$(CONFIG_MARU_BACKLIGHT) += maru_bl.o