1. 25 Jun, 2009 4 commits
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6 · a37f6b84
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6:
        ide cs5520: Initialize second port's interrupt number.
        ide: improve handling of Power Management requests
        ide: add QUANTUM FIREBALLct20 30 with firmware APL.090 to ivb_list[]
        ide: relax DMA info validity checking
        ide-cd: Improve "weird block size" error message
        ide-cd: Don't warn on bogus block size unless it actually matters.
        ide: fix handling of unexpected IRQs vs request_irq()
      a37f6b84
    • Peter Zijlstra's avatar
      clarify get_user_pages() prototype · 9d73777e
      Peter Zijlstra authored
      Currently the 4th parameter of get_user_pages() is called len, but its
      in pages, not bytes. Rename the thing to nr_pages to avoid future
      confusion.
      Signed-off-by: default avatarPeter Zijlstra <a.p.zijlstra@chello.nl>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      9d73777e
    • Paul Menage's avatar
      UML: Fix some apparent bitrot · ab420e6d
      Paul Menage authored
      UML: Fix some apparent bitrot
      
      - migration of net_device methods into net_device_ops
      - dma_sync_single() changes
      Signed-off-by: default avatarPaul Menage <menage@google.com>
      Acked-by: default avatarAmerigo Wang <xiyou.wangcong@gmail.com>
      --
      
      This version is split from my earlier patch, including just the
      portions that ar required for Linus' tree.
      
      Fixes the following compile errors:
      
      include/linux/dma-mapping.h:113: error: redefinition of 'dma_sync_single'
      arch/um/include/asm/dma-mapping.h:84: error: previous definition of 'dma_sync_single' was here
      include/linux/dma-mapping.h: In function 'dma_sync_single':
      include/linux/dma-mapping.h:117: error: implicit declaration of function 'dma_sync_single_for_cpu'
      include/linux/dma-mapping.h: At top level:
      include/linux/dma-mapping.h:120: error: redefinition of 'dma_sync_sg'
      arch/um/include/asm/dma-mapping.h:91: error: previous definition of 'dma_sync_sg' was here
      include/linux/dma-mapping.h: In function 'dma_sync_sg':
      include/linux/dma-mapping.h:124: error: implicit declaration of function 'dma_sync_sg_for_cpu'
      
      arch/um/drivers/slirp_kern.c: In function 'slirp_init':
      arch/um/drivers/slirp_kern.c:35: error: 'struct net_device' has no member named 'init'
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      ab420e6d
    • Ingo Molnar's avatar
      i2c: fix build bug in i2c-designware.c · 47749b14
      Ingo Molnar authored
      This build error triggers on x86:
      
       drivers/built-in.o: In function `i2c_dw_init':
       i2c-designware.c:(.text+0x4e37ca): undefined reference to `clk_get_rate'
       drivers/built-in.o: In function `dw_i2c_probe':
       i2c-designware.c:(.devinit.text+0x51f5e): undefined reference to `clk_get'
       i2c-designware.c:(.devinit.text+0x51f76): undefined reference to `clk_enable'
       i2c-designware.c:(.devinit.text+0x520ff): undefined reference to `clk_disable'
       i2c-designware.c:(.devinit.text+0x52108): undefined reference to `clk_put'
      
      Because this new driver uses the clk_*() facilities which is an
      ARM-only thing currently.
      Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
      Acked-by: default avatarBaruch Siach <baruch@tkos.co.il>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      47749b14
  2. 24 Jun, 2009 36 commits