summaryrefslogtreecommitdiff
path: root/libdde_linux26/lib/src/Makefile
diff options
context:
space:
mode:
authorSamuel Thibault <samuel.thibault@ens-lyon.org>2012-07-10 01:36:36 +0000
committerSamuel Thibault <samuel.thibault@ens-lyon.org>2012-07-10 01:36:36 +0000
commit2337c6841d00aac71f100549a08713786cd696d9 (patch)
tree05b799a90dc1c5537bac6478fd2cdea0cfe68728 /libdde_linux26/lib/src/Makefile
parent420ec9a9aa2fd36e4bbb67b3ee6c8471c37efa24 (diff)
parent7e3b6178f20258f60cc9e9a7671287e4e02ffb76 (diff)
Merge branch 'upstream-merged'
Diffstat (limited to 'libdde_linux26/lib/src/Makefile')
-rw-r--r--libdde_linux26/lib/src/Makefile3
1 files changed, 3 insertions, 0 deletions
diff --git a/libdde_linux26/lib/src/Makefile b/libdde_linux26/lib/src/Makefile
index 358196bb..4f1ec099 100644
--- a/libdde_linux26/lib/src/Makefile
+++ b/libdde_linux26/lib/src/Makefile
@@ -62,6 +62,7 @@ SRC_S_libdde_linux26.o.a += $(ARCH_DIR)/lib/delay.o
SRC_C_libdde_linux26.o.a += lib/rwsem.c
SRC_C_libdde_linux26.o.a += $(ARCH_DIR)/kernel/pci-dma.c
SRC_C_libdde_linux26.o.a += $(ARCH_DIR)/kernel/pci-nommu.c
+SRC_C_libdde_linux26.o.a += $(ARCH_DIR)/kernel/setup.c
SRC_S_libdde_linux26_net.a += $(ARCH_DIR)/lib/checksum_32.S
endif
@@ -85,6 +86,7 @@ endif
# + contrib stuff / slightly modified stuff
SRC_C_libdde_linux26.o.a += \
+ kernel/dma.c \
kernel/exit.c \
kernel/kthread.c \
kernel/mutex.c \
@@ -98,6 +100,7 @@ SRC_C_libdde_linux26.o.a += \
kernel/timer.c \
kernel/wait.c \
kernel/workqueue.c \
+ kernel/irq/handle.c \
lib/bitmap.c \
lib/bitrev.c \
lib/crc32.c \