diff options
| author | Olof Johansson <olof@lixom.net> | 2013-01-16 22:58:08 -0500 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-01-16 22:58:58 -0500 |
| commit | 5046e385b4426e229a6beb4bce480762af91a6fc (patch) | |
| tree | 65b4bff2c913a18840b3c58892853d51b942ac43 /arch/microblaze/kernel/syscall_table.S | |
| parent | a73b59c51ab288d81b515b504790267f594884b8 (diff) | |
| parent | b86dc0d8c12bbb9fed3f392c284bdc7114ce00c1 (diff) | |
Merge branch 'v3.8-samsung-fixes-3' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into fixes
From Kukjin Kim:
That branch fixes build error for S3C24XX/S3C64xx. And corrects dw-mshc
properties on EXYNOS5 DT and fixes IRQ mapping on Cragganmore board.
* 'v3.8-samsung-fixes-3' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
ARM: S3C64XX: Fix up IRQ mapping for balblair on Cragganmore
ARM: dts: correct the dw-mshc timing properties as per binding
ARM: S3C64XX: Fix build error with CONFIG_S3C_DEV_FB disabled
+ Linux 3.8-rc3
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/microblaze/kernel/syscall_table.S')
| -rw-r--r-- | arch/microblaze/kernel/syscall_table.S | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/microblaze/kernel/syscall_table.S b/arch/microblaze/kernel/syscall_table.S index 1cbace29b5e2..4fca56cf02f6 100644 --- a/arch/microblaze/kernel/syscall_table.S +++ b/arch/microblaze/kernel/syscall_table.S | |||
| @@ -380,3 +380,4 @@ ENTRY(sys_call_table) | |||
| 380 | .long sys_process_vm_readv | 380 | .long sys_process_vm_readv |
| 381 | .long sys_process_vm_writev | 381 | .long sys_process_vm_writev |
| 382 | .long sys_kcmp | 382 | .long sys_kcmp |
| 383 | .long sys_finit_module | ||