diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-01-23 13:31:15 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-01-23 13:31:15 -0800 |
| commit | 248152b60209874b1707a23d336b137486756a29 (patch) | |
| tree | 74375313bfe60dc0866501a0e1c4addc67720141 /arch/m68k/kernel | |
| parent | c1b84144c2123f274d2613369d83fc5c05d54ffa (diff) | |
| parent | e7e29b4cf3c4f2acb2433c45b29d1c7881321d36 (diff) | |
| download | linux-248152b60209874b1707a23d336b137486756a29.tar.gz linux-248152b60209874b1707a23d336b137486756a29.tar.bz2 linux-248152b60209874b1707a23d336b137486756a29.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k
Pull m68k fixes from Geert Uytterhoeven:
"The asm-generic changeset has been ack'ed by Arnd."
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
m68k: Wire up finit_module
asm-generic/dma-mapping-broken.h: Provide dma_alloc_attrs()/dma_free_attrs()
m68k: Provide dma_alloc_attrs()/dma_free_attrs()
Diffstat (limited to 'arch/m68k/kernel')
| -rw-r--r-- | arch/m68k/kernel/syscalltable.S | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/m68k/kernel/syscalltable.S b/arch/m68k/kernel/syscalltable.S index c30da5b3f2db..3f04ea0ab802 100644 --- a/arch/m68k/kernel/syscalltable.S +++ b/arch/m68k/kernel/syscalltable.S @@ -368,4 +368,5 @@ ENTRY(sys_call_table) .long sys_process_vm_readv /* 345 */ .long sys_process_vm_writev .long sys_kcmp + .long sys_finit_module |