From: Maksim Kozlov <m.kozlov@samsung.com>
Date: Fri, 1 Jun 2012 16:45:44 +0000 (+0400)
Subject: ARM: Add maru power supply virtual device
X-Git-Tag: 2.2.1_release^2~83^2~7^2~57
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=53b8e0af6dbc7343d43b64fe4d5aabcde1b16cca;p=sdk%2Femulator%2Femulator-kernel.git

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 f777de487eae..4c9229956b0c 100644
--- 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 78e48f432dcc..27678a322efd 100644
--- 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 3b4c39beb183..fbdaa150113f 100644
--- 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