power_supply: disable power_supply & added dependency

Change-Id: Ibf1f83c041214f6e06e19c3ad438363056c6db40
Signed-off-by: Jinhyung Choi <jinhyung2.choi@samsung.com>

diff --git a/arch/x86/configs/i386_tizen_emul_defconfig b/arch/x86/configs/i386_tizen_emul_defconfig
index 29ad61786afa15d5dd506209141a05087148dc1b..f1ea45e8ae00e48252ef3991946f84e2b552f515 100644 (file)
--- a/arch/x86/configs/i386_tizen_emul_defconfig
+++ b/arch/x86/configs/i386_tizen_emul_defconfig
@@ -1934,7 +1934,7 @@ CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
 CONFIG_GPIO_DEVRES=y
 # CONFIG_GPIOLIB is not set
 # CONFIG_W1 is not set
-CONFIG_POWER_SUPPLY=y
+# CONFIG_POWER_SUPPLY is not set
 # CONFIG_POWER_SUPPLY_DEBUG is not set
 # CONFIG_PDA_POWER is not set
 # CONFIG_TEST_POWER is not set

diff --git a/drivers/maru/Kconfig b/drivers/maru/Kconfig
index 4fd7b20a532ac38d5888845dd0abea420c9696c7..9b71224b86609d98046d44ecb732a79bfaeeedb4 100644 (file)
--- a/drivers/maru/Kconfig
+++ b/drivers/maru/Kconfig
@@ -32,9 +32,7 @@ config MARU_JACK
 
 config MARU_POWER_SUPPLY
        tristate "MARU Power supply Driver"
-       depends on MARU != n
-
-
+       depends on MARU != n && !POWER_SUPPLY
 
 config MARU_VIRTIO_HWKEY
        tristate "MARU Virtio HW Key Driver"

diff --git a/drivers/maru/Makefile b/drivers/maru/Makefile
index df7ca774fc0fa7e9293bfef5575e52e3f12d0526..7af94e5cee83026c236739c32dddfe3368af0e73 100644 (file)
--- a/drivers/maru/Makefile
+++ b/drivers/maru/Makefile
@@ -5,7 +5,7 @@ obj-$(CONFIG_MARU_BACKLIGHT) += maru_bl.o
 obj-$(CONFIG_MARU_OVERLAY) += maru_overlay.o
 obj-$(CONFIG_MARU_VIRTIO_HWKEY) += maru_virtio_hwkey.o
 obj-$(CONFIG_MARU_JACK) += maru_jack.o
-#obj-$(CONFIG_MARU_POWER_SUPPLY) += maru_power_supply.o
+obj-$(CONFIG_MARU_POWER_SUPPLY) += maru_power_supply.o
 obj-$(CONFIG_MARU_VIRTIO_KEYBOARD) += maru_virtio_keyboard.o
 obj-$(CONFIG_MARU_VIRTIO_NFC) += maru_virtio_nfc.o
 obj-$(CONFIG_MARU_VIRTIO_EVDI) += maru_virtio_evdi.o