diff options
| author | Wolfgang Denk <[email protected]> | 2009-12-05 02:11:59 +0100 |
|---|---|---|
| committer | Wolfgang Denk <[email protected]> | 2009-12-05 02:11:59 +0100 |
| commit | 2a49bf3149e34e6f910e70bbc0a26e81cfdbdf70 (patch) | |
| tree | e19b3def6c8f41f56cdb5e8b71aa53d8f72f5812 /lib_ppc/Makefile | |
| parent | cd514aeb996e2f7aefbe1f78481965d9d074aed4 (diff) | |
| parent | f68ab43de67f59925542efb6bcec30f4a84fe695 (diff) | |
Merge branch 'master' into next
Conflicts:
board/esd/plu405/plu405.c
drivers/rtc/ftrtc010.c
Signed-off-by: Wolfgang Denk <[email protected]>
Diffstat (limited to 'lib_ppc/Makefile')
| -rw-r--r-- | lib_ppc/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib_ppc/Makefile b/lib_ppc/Makefile index 399b41e31e0..60a76253b26 100644 --- a/lib_ppc/Makefile +++ b/lib_ppc/Makefile @@ -35,7 +35,7 @@ COBJS-y += bootm.o COBJS-y += cache.o COBJS-y += extable.o COBJS-y += interrupts.o -COBJS-y += kgdb.o +COBJS-$(CONFIG_CMD_KGDB) += kgdb.o COBJS-y += time.o SRCS := $(SOBJS-y:.o=.S) $(COBJS-y:.o=.c) |