1. 15 1月, 2010 36 次提交
  2. 14 1月, 2010 4 次提交
    • R
      ARM: S3C: NAND: Check the existence of nr_map before copying · 9b96918a
      Ramax Lo 提交于
      Since the structure field nr_map is optional, we need to check whether the
      chip number map is provided to avoid unexpected NULL pointer exception.
      Signed-off-by: NRamax Lo <ramaxlo@gmail.com>
      Signed-off-by: NBen Dooks <ben-linux@fluff.org>
      9b96918a
    • L
      Merge branch 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 · 004b3506
      Linus Torvalds 提交于
      * 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
        drm: change drm set mode messages as DRM_DEBUG
        drm: fix crtc no modes printf + typo
        drm/radeon/kms: only evict to GTT if CP is ready
        drm/radeon/kms: Fix crash getting TV info with no BIOS.
        drm/radeon/kms/rv100: reject modes > 135 Mhz on DVI (v2)
        drm/radeon/kms/r6xx+: make irq handler less verbose
        drm/radeon/kms: fix up LVDS handling on macs (v2)
      004b3506
    • B
      zlib: Fix build of powerpc boot wrapper · 6846ee5c
      Benjamin Herrenschmidt 提交于
      Commit ac4c2a3b broke the build
      of all powerpc boot wrappers.
      
      It attempts to add an include of autoconf.h but used the wrong
      path for it. It also adds -D__KERNEL__ to our boot wrapper, both
      things that we pretty much didn't do on purpose so far.
      
      We want our boot wrapper to remain independent enough of the kernel
      for various reasons, one of them being that you can "wrap" an existing
      kernel at distro install time which allows to ship one kernel image
      and a set of boot wrappers for different platforms, the wrappers
      don't have to be built out of the same kernel build tree.
      
      It's also incorrect to do what the patch does in our boot environment
      since we may not have a proper alignment exception handler which means
      we may not be able to fixup the few cases where an unaligned access will
      need SW emulation (depends on the core variant, could be when crossing
      page or segment boundaries for example).
      
      This patch fixes it by putting the old code back in and using the
      new "fancy" variant only when CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS
      is set, which happens not to be set on powerpc since we don't include
      autoconf.h. It also reverts the changes to our boot wrapper Makefile.
      
      This means that x86 should, afaik, keep the optimisations since its
      boot wrapper does include autoconf.h and define __KERNEL__ (though I
      doubt they make that much different outside of slow embedded processors).
      Signed-off-by: NBenjamin Herrenschmidt <benh@kernel.crashing.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      6846ee5c
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid · 8866f9df
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
        HID: wacom: Add BTN_TOOL_FINGER for pad button reporting
        HID: add device IDs for new model of Apple Wireless Keyboard
        HID: fix pad button definition in hid-wacom
        HID: Support 171 byte variant of Samsung USB IR receiver
        HID: blacklist ET&T TC5UH touchscreen controller
      8866f9df