diff options
| author | Peter Chen <peter.chen@freescale.com> | 2013-11-19 10:38:55 +0800 |
|---|---|---|
| committer | Peter Chen <peter.chen@freescale.com> | 2013-11-22 14:31:31 +0800 |
| commit | f7ced5666665e45e5eeeadfff6b441719a8bd3ff (patch) | |
| tree | 94a194459bd9bf5932a10b65ae7e26e75f015846 /drivers | |
| parent | 0f96412d64e5a1ba2faae9a6e50d9109fd37968d (diff) | |
ENGR00288522 power: imx6-usb-charger: fix build error when build as module
It is a library, so it can't be built as a module, besides,
it uses anatop register, it should depends on imx6 soc series.
Below is the build error message it fixes:
CC [M] drivers/power/imx6_usb_charger.o
/home/b29397/work/projects/linux-2.6-imx/drivers/power/imx6_usb_charger.c:173:5: error: redefinition of 'imx6_usb_vbus_connect'
/home/b29397/work/projects/linux-2.6-imx/include/linux/power/imx6_usb_charger.h:70:5: note: previous definition of 'imx6_usb_vbus_connect' was here
/home/b29397/work/projects/linux-2.6-imx/drivers/power/imx6_usb_charger.c:200:5: error: redefinition of 'imx6_usb_charger_detect_post'
/home/b29397/work/projects/linux-2.6-imx/include/linux/power/imx6_usb_charger.h:74:5: note: previous definition of 'imx6_usb_charger_detect_post' was here
/home/b29397/work/projects/linux-2.6-imx/drivers/power/imx6_usb_charger.c:235:5: error: redefinition of 'imx6_usb_vbus_disconnect'
/home/b29397/work/projects/linux-2.6-imx/include/linux/power/imx6_usb_charger.h:65:5: note: previous definition of 'imx6_usb_vbus_disconnect' was here
/home/b29397/work/projects/linux-2.6-imx/drivers/power/imx6_usb_charger.c:256:5: error: redefinition of 'imx6_usb_create_charger'
/home/b29397/work/projects/linux-2.6-imx/include/linux/power/imx6_usb_charger.h:59:5: note: previous definition of 'imx6_usb_create_charger' was here
/home/b29397/work/projects/linux-2.6-imx/drivers/power/imx6_usb_charger.c:290:6: error: redefinition of 'imx6_usb_remove_charger'
/home/b29397/work/projects/linux-2.6-imx/include/linux/power/imx6_usb_charger.h:54:6: note: previous definition of 'imx6_usb_remove_charger' was here
make[3]: *** [drivers/power/imx6_usb_charger.o] Error 1
make[2]: *** [drivers/power] Error 2
Signed-off-by: Peter Chen <peter.chen@freescale.com>
(cherry picked from commit dd197c1bb3b87d8e58718375eeafe28d643cfe3b)
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/power/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/power/Kconfig b/drivers/power/Kconfig index 7c6d4d9fc8a3..de47f46d6dd5 100644 --- a/drivers/power/Kconfig +++ b/drivers/power/Kconfig @@ -371,8 +371,8 @@ config BATTERY_GOLDFISH Goldfish emulator. config IMX6_USB_CHARGER - tristate "Freescale imx6 USB Charger" - depends on USB_CHIPIDEA && USB_GADGET + bool "Freescale imx6 USB Charger" + depends on SOC_IMX6Q || SOC_IMX6SL help Say Y to enable Freescale imx6 USB Charger Detect. |