Skip to content

Commit

Permalink
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-…
Browse files Browse the repository at this point in the history
…linus

* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
  [MIPS] Fix iounmap argument to const volatile.
  [MIPS] Reserve syscall numbers for kexec_load.
  [MIPS] Update tb0287_defconfig
  [MIPS] Update pnx8550-v2pci_defconfig
  [MIPS] Update pnx8500-jbs_defconfig
  [MIPS] More vr41xx pt_regs fixups
  [MIPS] save_context_stack fix
  [MIPS] Use compat_sys_mount.
  [MIPS] Fix O32 personality(2) call with 0xffffffff argument.
  [MIPS] A few more pt_regs fixups.
  [MIPS] Malta: Fix uninitialized regs pointer.
  [MIPS] Delete unneeded pt_regs forward declaration.
  [MIPS] Use kallsyms_lookup_size_offset() instead of kallsyms_lookup()
  • Loading branch information
Linus Torvalds committed Oct 20, 2006
2 parents b2ef785 + d89e36d commit f1877fb
Show file tree
Hide file tree
Showing 21 changed files with 845 additions and 227 deletions.
2 changes: 1 addition & 1 deletion arch/mips/au1000/common/dbdma.c
Original file line number Diff line number Diff line change
Expand Up @@ -849,7 +849,7 @@ au1xxx_dbdma_chan_free(u32 chanid)
EXPORT_SYMBOL(au1xxx_dbdma_chan_free);

static irqreturn_t
dbdma_interrupt(int irq, void *dev_id, struct pt_regs *regs)
dbdma_interrupt(int irq, void *dev_id)
{
u32 intstat;
u32 chan_index;
Expand Down
Loading

0 comments on commit f1877fb

Please sign in to comment.