diff options
author | Stefan Roese <sr@denx.de> | 2007-12-11 10:34:54 (GMT) |
---|---|---|
committer | Stefan Roese <sr@denx.de> | 2007-12-11 10:34:54 (GMT) |
commit | 9caeaadf508cd0e11ac5dfc56ab0f72e3b89a105 (patch) | |
tree | 1afcc9c20c04e19870ab5e2996104877695c54a3 /cpu/arm920t/s3c24x0/Makefile | |
parent | 7cfc12a7dcfdb350e2ab76db4dafcc30f7e77c2b (diff) | |
parent | 41be969f4957115ed7b1fe8b890bfaee99d7a7a2 (diff) | |
download | u-boot-9caeaadf508cd0e11ac5dfc56ab0f72e3b89a105.tar.xz |
Merge commit 'u-boot/master' into for-1.3.1
Conflicts:
drivers/rtc/Makefile
Diffstat (limited to 'cpu/arm920t/s3c24x0/Makefile')
-rw-r--r-- | cpu/arm920t/s3c24x0/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cpu/arm920t/s3c24x0/Makefile b/cpu/arm920t/s3c24x0/Makefile index 0ff36c5..1ed9bf3 100644 --- a/cpu/arm920t/s3c24x0/Makefile +++ b/cpu/arm920t/s3c24x0/Makefile @@ -26,7 +26,7 @@ include $(TOPDIR)/config.mk LIB = $(obj)lib$(SOC).a COBJS = i2c.o interrupts.o serial.o speed.o \ - usb.o + usb.o usb_ohci.o SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) OBJS := $(addprefix $(obj),$(SOBJS) $(COBJS)) |