Merge branch 'u-boot/master' into 'u-boot-arm/master'

[oweals/u-boot.git] / board / actux2 / u-boot.lds

diff --git a/board/actux2/u-boot.lds b/board/actux2/u-boot.lds
index 300273bf7aa95bb08e05bc7bec59d142302124bb..f00d7c72b1fa15149e33bd13e5201e8a0e934aed 100644 (file)
--- a/board/actux2/u-boot.lds
+++ b/board/actux2/u-boot.lds
@@ -16,10 +16,10 @@ SECTIONS
        .text : {
                *(.__image_copy_start)
                arch/arm/cpu/ixp/start.o(.text*)
-               net/libnet.o(.text*)
-               board/actux2/libactux2.o(.text*)
-               arch/arm/cpu/ixp/libixp.o(.text*)
-               drivers/input/libinput.o(.text*)
+               net/built-in.o(.text*)
+               board/actux2/built-in.o(.text*)
+               arch/arm/cpu/ixp/built-in.o(.text*)
+               drivers/input/built-in.o(.text*)
 
                . = env_offset;
                common/env_embedded.o(.ppcenv)