1. 25 Jan, 2011 3 commits
    • Russell King's avatar
      ARM: versatile: name configuration options after actual board names · e5310f61
      Russell King authored
      Update the option text to those which appear on the front of the
      appropriate board user guides.  This gives consistent board naming, and
      makes it obvious which option is for which platform.
      Acked-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
      Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
      e5310f61
    • Russell King's avatar
      ARM: realview: name configuration options after actual board names · d2a1c9ad
      Russell King authored
      As no one seems to really know which configuration options tie up with
      which boards, I thought I'd do some investigation and try to work it
      out.  After discussion with some folk in linaro, I think I have this
      nailed.
      
      The names are updated to use the name on the front of the appropriate
      board user guide for the various baseboards, which I've taken to be
      the official name for each board.
      
      I haven't significantly updated the descriptions for the tiles as that
      is even less clear - as far as I can see on ARMs website, there is no
      Cortex-A9 tile for Realview EB - only ARM11MPCore, ARM1156T2F-S,
      ARM1176TZF-S and Cortex-R4F.  So exactly what this 'Multicore Cortex-A9
      Tile' is...
      Acked-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
      Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
      d2a1c9ad
    • Russell King's avatar
      ARM: realview,vexpress: fix section mismatch warning for pen_release · ec15038f
      Russell King authored
      Fix two section mismatch warnings in the platform SMP bringup code for
      Realview and Versatile Express:
      
      WARNING: arch/arm/mach-realview/built-in.o(.text+0x8ac): Section mismatch in reference from the function write_pen_release() to the variable .cpuinit.data:pen_release
      The function write_pen_release() references
      the variable __cpuinitdata pen_release.
      This is often because write_pen_release lacks a __cpuinitdata
      annotation or the annotation of pen_release is wrong.
      
      WARNING: arch/arm/mach-vexpress/built-in.o(.text+0x7b4): Section mismatch in reference from the function write_pen_release() to the variable .cpuinit.data:pen_release
      The function write_pen_release() references
      the variable __cpuinitdata pen_release.
      This is often because write_pen_release lacks a __cpuinitdata
      annotation or the annotation of pen_release is wrong.
      Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
      ec15038f
  2. 22 Jan, 2011 2 commits
    • Linus Torvalds's avatar
      Linux 2.6.38-rc2 · 1bae4ce2
      Linus Torvalds authored
      1bae4ce2
    • Linus Torvalds's avatar
      Merge branch 'media_fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6 · 13a3cec8
      Linus Torvalds authored
      * 'media_fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (101 commits)
        [media] staging/lirc: fix mem leaks and ptr err usage
        [media] hdpvr: reduce latency of i2c read/write w/recycled buffer
        [media] hdpvr: enable IR part
        [media] rc/mceusb: timeout should be in ns, not us
        [media] v4l2-device: fix 'use-after-freed' oops
        [media] v4l2-dev: don't memset video_device.dev
        [media] zoran: use video_device_alloc instead of kmalloc
        [media] w9966: zero device state after a detach
        [media] v4l: Fix a use-before-set in the control framework
        [media] v4l: Include linux/videodev2.h in media/v4l2-ctrls.h
        [media] DocBook/v4l: update V4L2 revision and update copyright years
        [media] DocBook/v4l: fix validation error in dev-rds.xml
        [media] v4l2-ctrls: queryctrl shouldn't attempt to replace V4L2_CID_PRIVATE_BASE IDs
        [media] v4l2-ctrls: fix missing 'read-only' check
        [media] pvrusb2: Provide more information about IR units to lirc_zilog and ir-kbd-i2c
        [media] ir-kbd-i2c: Add back defaults setting for Zilog Z8's at addr 0x71
        [media] lirc_zilog: Update TODO.lirc_zilog
        [media] lirc_zilog: Add Andy Walls to copyright notice and authors list
        [media] lirc_zilog: Remove useless struct i2c_driver.command function
        [media] lirc_zilog: Remove unneeded tests for existence of the IR Tx function
        ...
      13a3cec8
  3. 21 Jan, 2011 35 commits