diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-09-14 17:07:33 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-09-14 17:07:33 -0700 |
commit | 2605a103cadb29053d6bc7e81c7de802ec75ce6c (patch) | |
tree | e2a83845f59217d66252c7a9265ff99a3b69f525 /arch/xtensa/kernel/Makefile | |
parent | 53a3f3087be361dacfc02e7a85b6d6142a41ce8a (diff) | |
parent | ebb2a97b2e7422176d52f4f33e3ee400653875b4 (diff) |
Merge git://git.linux-xtensa.org/kernel/xtensa-feed
* git://git.linux-xtensa.org/kernel/xtensa-feed:
[patch 1/2] Xtensa: enable arbitary tty speed setting ioctls
[patch 2/2] xtensa console.c: remove duplicate #include
[XTENSA] Add support for cache-aliasing
[XTENSA] Add kernel module support
[XTENSA] Add support for executable/non-executable feature in the mmu
[XTENSA] Use the generic version of get_order
[XTENSA] Initialize semaphore_wake_lock
[XTENSA] Add typecast macro for constants
[XTENSA] Fix timer instabilities.
[XTENSA] Fix fadvise64_64
[XTENSA] Remove extraneous include statement
[XTENSA] Move string-io functions to io.c from pci.c
[XTENSA] Move pre-initialized structures to init_task.c
[XTENSA] Add freestanding option to CFLAGS
[XTENSA] Add getpgrp system-call to unistd.h
[XTENSA] add missing system calls
[XTENSA] fix wrong usage of __init and __initdata in traps.c
Diffstat (limited to 'arch/xtensa/kernel/Makefile')
-rw-r--r-- | arch/xtensa/kernel/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/xtensa/kernel/Makefile b/arch/xtensa/kernel/Makefile index 71f733c4f66..f582d6a24ec 100644 --- a/arch/xtensa/kernel/Makefile +++ b/arch/xtensa/kernel/Makefile @@ -7,7 +7,7 @@ extra-y := head.o vmlinux.lds obj-y := align.o entry.o irq.o coprocessor.o process.o ptrace.o semaphore.o \ setup.o signal.o syscall.o time.o traps.o vectors.o platform.o \ - pci-dma.o + pci-dma.o init_task.o io.o ## windowspill.o |