From: Jinhyung Choi Date: Tue, 29 Apr 2014 06:54:11 +0000 (+0900) Subject: power_supply: disable power_supply & added dependency X-Git-Tag: submit/tizen_common/20140905.094502~101^2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F78%2F20178%2F2;p=sdk%2Femulator%2Femulator-kernel.git power_supply: disable power_supply & added dependency Change-Id: Ibf1f83c041214f6e06e19c3ad438363056c6db40 Signed-off-by: Jinhyung Choi --- diff --git a/arch/x86/configs/i386_tizen_emul_defconfig b/arch/x86/configs/i386_tizen_emul_defconfig index 29ad61786afa..f1ea45e8ae00 100644 --- 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 4fd7b20a532a..9b71224b8660 100644 --- 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 df7ca774fc0f..7af94e5cee83 100644 --- 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