1. Sep 13, 2007
  2. Sep 12, 2007
    • Kumar Gala's avatar
      [POWERPC] Enable GENERIC_ISA_DMA if FSL_ULI1575 to fix compile issue · fb4f0e88
      Kumar Gala authored
      
      
      Since the ULI1575 has a ISA bus we need to enable the generic ISA dma
      support for drivers that might expect it.  Without this we get compile
      errors like the following:
      
      ound/built-in.o: In function `claim_dma_lock':
      /home/galak/git/linux-8572/include/asm/dma.h:189: undefined reference to `dma_spin_lock'
      /home/galak/git/linux-8572/include/asm/dma.h:189: undefined reference to `dma_spin_lock'
      sound/built-in.o: In function `release_dma_lock':
      /home/galak/git/linux-8572/include/asm/dma.h:195: undefined reference to `dma_spin_lock'
      sound/built-in.o: In function `claim_dma_lock':
      /home/galak/git/linux-8572/include/asm/dma.h:189: undefined reference to `dma_spin_lock'
      /home/galak/git/linux-8572/include/asm/dma.h:189: undefined reference to `dma_spin_lock'
      sound/built-in.o:/home/galak/git/linux-8572/include/asm/dma.h:195: more undefined references to `dma_spin_lock' follow
      make: *** [.tmp_vmlinux1] Error 1
      
      Signed-off-by: default avatarKumar Gala <galak@kernel.crashing.org>
      fb4f0e88
    • Linus Torvalds's avatar
      Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 · 0bc73c25
      Linus Torvalds authored
      * master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
        [BLUETOOTH]: Fix non-COMPAT build of hci_sock.c
      0bc73c25
    • Linus Torvalds's avatar
      Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 · 040a2b6b
      Linus Torvalds authored
      * master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
        [SPARC64]: Fix booting on V100 systems.
      040a2b6b