diff options
| author | Peter Chen <peter.chen@freescale.com> | 2013-11-18 21:38:55 -0500 |
|---|---|---|
| committer | Nitin Garg <nitin.garg@freescale.com> | 2014-04-16 09:47:21 -0400 |
| commit | 0750ccf08a0b7446f33754630fb8a5a7f5a66eb9 (patch) | |
| tree | 7549eda1226f6bfed83b4594fe2d3a17ebece361 | |
| parent | 10c0e23ad5f601136235a3db3dedd6bc38635062 (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>
| -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 | |||
| 371 | Goldfish emulator. | 371 | Goldfish emulator. |
| 372 | 372 | ||
| 373 | config IMX6_USB_CHARGER | 373 | config IMX6_USB_CHARGER |
| 374 | tristate "Freescale imx6 USB Charger" | 374 | bool "Freescale imx6 USB Charger" |
| 375 | depends on USB_CHIPIDEA && USB_GADGET | 375 | depends on SOC_IMX6Q || SOC_IMX6SL |
| 376 | help | 376 | help |
| 377 | Say Y to enable Freescale imx6 USB Charger Detect. | 377 | Say Y to enable Freescale imx6 USB Charger Detect. |
| 378 | 378 | ||