diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-05 13:24:16 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-05 13:24:16 +0000 |
| commit | a32737e1ca650504f172292dd344eb64c02311f3 (patch) | |
| tree | 7dd2004ece26081507af877d9dd40b1bd4eecc1a /arch/arm/kernel/Makefile | |
| parent | 27edacac7d97d37ec77779c7da08345298a5d283 (diff) | |
| parent | a3c2b511a844641f6d0b60bd84cd6076143b3f2d (diff) | |
Merge branches 'fixes' and 'misc' into for-linus
Diffstat (limited to 'arch/arm/kernel/Makefile')
| -rw-r--r-- | arch/arm/kernel/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/kernel/Makefile b/arch/arm/kernel/Makefile index 16eed6aebfa..43b740d0e37 100644 --- a/arch/arm/kernel/Makefile +++ b/arch/arm/kernel/Makefile @@ -13,7 +13,7 @@ CFLAGS_REMOVE_return_address.o = -pg # Object file lists. -obj-y := elf.o entry-armv.o entry-common.o irq.o \ +obj-y := elf.o entry-armv.o entry-common.o irq.o opcodes.o \ process.o ptrace.o return_address.o setup.o signal.o \ sys_arm.o stacktrace.o time.o traps.o |