1. 04 Jan, 2010 2 commits
  2. 21 Dec, 2009 2 commits
    • Albert Herranz's avatar
      powerpc/gc/wii: Remove get_irq_desc() · 95cd34b4
      Albert Herranz authored
      Fix the following build failures:
      
      arch/powerpc/platforms/embedded6xx/flipper-pic.c: In function 'flipper_pic_map':
      arch/powerpc/platforms/embedded6xx/flipper-pic.c:105: error: implicit declaration of function 'get_irq_desc'
      
      arch/powerpc/platforms/embedded6xx/hlwd-pic.c: In function 'hlwd_pic_map':
      arch/powerpc/platforms/embedded6xx/hlwd-pic.c:98: error: implicit declaration of function 'get_irq_desc'
      
      These failures are caused by the changes introduced in commit
      "powerpc: Remove get_irq_desc()". The reason these drivers were not
      updated is that they weren't merged yet.
      Signed-off-by: default avatarAlbert Herranz <albert_herranz@yahoo.es>
      Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
      95cd34b4
    • Albert Herranz's avatar
      powerpc/gc/wii: hlwd-pic: convert irq_desc.lock to raw_spinlock · 7ccec3e7
      Albert Herranz authored
      Fix the following build failures:
      
      arch/powerpc/platforms/embedded6xx/hlwd-pic.c: In function 'hlwd_pic_irq_cascade':
      arch/powerpc/platforms/embedded6xx/hlwd-pic.c:135: error: passing argument 1 of 'spin_lock' from incompatible pointer type
      arch/powerpc/platforms/embedded6xx/hlwd-pic.c:137: error: passing argument 1 of 'spin_unlock' from incompatible pointer type
      arch/powerpc/platforms/embedded6xx/hlwd-pic.c:145: error: passing argument 1 of 'spin_lock' from incompatible pointer type
      arch/powerpc/platforms/embedded6xx/hlwd-pic.c:149: error: passing argument 1 of 'spin_unlock' from incompatible pointer type
      
      These failures are caused by the changes introduced in commit
      "genirq: Convert irq_desc.lock to raw_spinlock". The reason this driver
      was not updated is that it wasn't merged yet.
      Signed-off-by: default avatarAlbert Herranz <albert_herranz@yahoo.es>
      Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
      7ccec3e7
  3. 20 Dec, 2009 2 commits
  4. 18 Dec, 2009 29 commits
  5. 17 Dec, 2009 5 commits
    • Linus Torvalds's avatar
      Merge branch 'next-spi' of git://git.secretlab.ca/git/linux-2.6 · bf931a01
      Linus Torvalds authored
      * 'next-spi' of git://git.secretlab.ca/git/linux-2.6:
        spi: spi_txx9.c: use resource_size()
        spi: spi_sh_sci.c: use resource_size()
        spi: spi_mpc8xxx.c: use resource_size()
        spi: spi_bfin5xx.c: use resource_size()
        spi: atmel_spi.c: use resource_size()
        spi: Add s3c64xx SPI Controller driver
        atmel_spi: fix dma addr calculation for len > BUFFER_SIZE
        spi_s3c24xx: add FIQ pseudo-DMA support
        spi: controller driver for Designware SPI core
        spidev: add proper section markers
        spidev: use DECLARE_BITMAP instead of declaring the array
      bf931a01
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.o-hand.com/linux-rpurdie-backlight · 4e46aa08
      Linus Torvalds authored
      * 'for-linus' of git://git.o-hand.com/linux-rpurdie-backlight:
        backlight: mbp_nvidia_bl - add two more MacBookPro variants
        backlight: Pass device through notify callback in the pwm driver
        backlight: PTR_ERR return of wrong pointer in cr_backlight_probe()
        backlight: Constify struct backlight_ops
        backlight/thinkpad-acpi: issue backlight class events
      
      Fix up trivial conflicts in thinkpad-acpi support (backlight support
      already merged earlier).
      4e46aa08
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.o-hand.com/linux-rpurdie-leds · 9209e4bd
      Linus Torvalds authored
      * 'for-linus' of git://git.o-hand.com/linux-rpurdie-leds:
        leds: leds-pwm: Set led_classdev max_brightness
        leds: leds-lp3944.h - remove unneeded includes
        leds: use default-on trigger for Cobalt Qube
        leds: drivers/leds/leds-ss4200.c: fix return statement
        leds: leds-pca9532.h- indent with tabs, not spaces
        leds: Add LED class driver for regulator driven LEDs.
        leds: leds-cobalt-qube.c: use resource_size()
        leds: leds-cobalt-raq.c - use resource_size()
        leds: Add driver for ADP5520/ADP5501 MFD PMICs
        leds: Add driver for LT3593 controlled LEDs
        leds-ss4200: Check pci_enable_device return
        leds: leds-alix2c - take port address from MSR
        leds: LED driver for Intel NAS SS4200 series (v5)
      9209e4bd
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm · a695bc68
      Linus Torvalds authored
      * 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm:
        PCMCIA: fix pxa2xx_lubbock modular build error
        [ARM] Update mach-types
        [ARM] pxa: fix no reference of cpu_is_pxa25x() in devices.c
        [ARM] pxa/cm-x300: add PWM backlight support
        revert "[ARM] pxa/cm-x300: add PWM backlight support"
        ARM: use flush_kernel_dcache_area() for dmabounce
        ARM: add size argument to __cpuc_flush_dcache_page
        ARM: 5848/1: kill flush_ioremap_region()
        ARM: cache-l2x0: make better use of background cache handling
        ARM: cache-l2x0: avoid taking spinlock for every iteration
        [ARM] Kirkwood: Add LaCie Network Space v2 support
        ARM: dove: fix the mm mmu flags of the pj4 procinfo
      a695bc68
    • Randy Dunlap's avatar
      printk: fix new kernel-doc warnings · 6485536b
      Randy Dunlap authored
      Fix kernel-doc warnings in printk.c:
      
      Warning(kernel/printk.c:1422): No description found for parameter 'dumper'
      Warning(kernel/printk.c:1422): Excess function parameter 'dump' description in 'kmsg_dump_register'
      Warning(kernel/printk.c:1451): No description found for parameter 'dumper'
      Warning(kernel/printk.c:1451): Excess function parameter 'dump' description in 'kmsg_dump_unregister'
      Signed-off-by: default avatarRandy Dunlap <randy.dunlap@oracle.com>
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      6485536b