diff options
author | David Woodhouse <dwmw2@infradead.org> | 2006-05-03 13:30:35 +0100 |
---|---|---|
committer | David Woodhouse <dwmw2@infradead.org> | 2006-05-03 13:30:35 +0100 |
commit | edc4ff7c08e9885c40e60c4fb39fa42cc91a0602 (patch) | |
tree | f375d28043dd4457428a841167dc93d760ba9a46 /arch/mips/ddb5xxx/ddb5074/Makefile | |
parent | Move jffs2_fs_i.h and jffs2_fs_sb.h from include/linux/ to fs/jffs2/ (diff) | |
parent | [NETFILTER] SCTP conntrack: fix infinite loop (diff) | |
download | linux-dev-edc4ff7c08e9885c40e60c4fb39fa42cc91a0602.tar.xz linux-dev-edc4ff7c08e9885c40e60c4fb39fa42cc91a0602.zip |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/mips/ddb5xxx/ddb5074/Makefile')
-rw-r--r-- | arch/mips/ddb5xxx/ddb5074/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/ddb5xxx/ddb5074/Makefile b/arch/mips/ddb5xxx/ddb5074/Makefile index 488206b8d94e..304c02107b46 100644 --- a/arch/mips/ddb5xxx/ddb5074/Makefile +++ b/arch/mips/ddb5xxx/ddb5074/Makefile @@ -3,6 +3,6 @@ # under Linux. # -obj-y += setup.o irq.o int-handler.o nile4_pic.o +obj-y += setup.o irq.o nile4_pic.o EXTRA_AFLAGS := $(CFLAGS) |