Revision 717ce646395b8606515563edc5f57b27cf559bee authored by Florian Fainelli on 24 September 2014, 17:55:10 UTC, committed by Ralf Baechle on 24 November 2014, 06:44:06 UTC
Commit 1004165f346a ("MIPS: Netlogic: USB support for XLP") and then
commit 9eac3591e78b ("MIPS: Netlogic: Add support for USB on XLP2xx")
added usb-init and usb-init-xlp2 as objects to build when CONFIG_USB is
enabled.

If CONFIG_USB is made modular, these two files will also get built as
modules (obj-m), which will result in the following linking failure:

ERROR: "nlm_io_base" [arch/mips/netlogic/xlp/usb-init.ko] undefined!
ERROR: "nlm_nodes" [arch/mips/netlogic/xlp/usb-init-xlp2.ko] undefined!
ERROR: "nlm_set_pic_extra_ack" [arch/mips/netlogic/xlp/usb-init-xlp2.ko]
undefined!
ERROR: "xlp_socdev_to_node" [arch/mips/netlogic/xlp/usb-init-xlp2.ko]
undefined!
ERROR: "nlm_io_base" [arch/mips/netlogic/xlp/usb-init-xlp2.ko]
undefined!

Just check whether CONFIG_USB is defined for this build, and if that is
the case, add these objects to the list of built-in object files.

Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Cc: linux-mips@linux-mips.org
Cc: ganesanr@broadcom.com
Cc: jchandra@broadcom.com
Patchwork: https://patchwork.linux-mips.org/patch/7854/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
1 parent 26927f7
History
File Mode Size
Kconfig -rw-r--r-- 3.7 KB
Makefile -rw-r--r-- 685 bytes
font_10x18.c -rw-r--r-- 140.6 KB
font_6x10.c -rw-r--r-- 60.8 KB
font_6x11.c -rw-r--r-- 66.6 KB
font_7x14.c -rw-r--r-- 79.1 KB
font_8x16.c -rw-r--r-- 93.7 KB
font_8x8.c -rw-r--r-- 49.7 KB
font_acorn_8x8.c -rw-r--r-- 15.7 KB
font_mini_4x6.c -rw-r--r-- 54.6 KB
font_pearl_8x8.c -rw-r--r-- 54.4 KB
font_sun12x22.c -rw-r--r-- 181.5 KB
font_sun8x16.c -rw-r--r-- 22.1 KB
fonts.c -rw-r--r-- 3.0 KB

back to top